diff --git a/atom.xml b/atom.xml index 2a41d3830f..15f6945941 100644 --- a/atom.xml +++ b/atom.xml @@ -4,7 +4,7 @@ <![CDATA[Home Assistant]]> - 2016-04-22T14:56:12+00:00 + 2016-04-23T08:12:51+00:00 https://home-assistant.io/ diff --git a/blog/categories/community/atom.xml b/blog/categories/community/atom.xml index 719caca53b..7b9b66dbc4 100644 --- a/blog/categories/community/atom.xml +++ b/blog/categories/community/atom.xml @@ -4,7 +4,7 @@ <![CDATA[Category: Community | Home Assistant]]> - 2016-04-22T14:56:12+00:00 + 2016-04-23T08:12:51+00:00 https://home-assistant.io/ diff --git a/blog/categories/esp8266/atom.xml b/blog/categories/esp8266/atom.xml index 16be13f738..07f06b6277 100644 --- a/blog/categories/esp8266/atom.xml +++ b/blog/categories/esp8266/atom.xml @@ -4,7 +4,7 @@ <![CDATA[Category: ESP8266 | Home Assistant]]> - 2016-04-22T14:56:12+00:00 + 2016-04-23T08:12:51+00:00 https://home-assistant.io/ diff --git a/blog/categories/how-to/atom.xml b/blog/categories/how-to/atom.xml index 8d6c693dac..b2b78b51a2 100644 --- a/blog/categories/how-to/atom.xml +++ b/blog/categories/how-to/atom.xml @@ -4,7 +4,7 @@ <![CDATA[Category: How-To | Home Assistant]]> - 2016-04-22T14:56:12+00:00 + 2016-04-23T08:12:51+00:00 https://home-assistant.io/ diff --git a/blog/categories/internet-of-things/atom.xml b/blog/categories/internet-of-things/atom.xml index bec0c259eb..b727b30309 100644 --- a/blog/categories/internet-of-things/atom.xml +++ b/blog/categories/internet-of-things/atom.xml @@ -4,7 +4,7 @@ <![CDATA[Category: Internet-of-Things | Home Assistant]]> - 2016-04-22T14:56:12+00:00 + 2016-04-23T08:12:51+00:00 https://home-assistant.io/ diff --git a/blog/categories/mqtt/atom.xml b/blog/categories/mqtt/atom.xml index 4e4ff72591..f8a6238eca 100644 --- a/blog/categories/mqtt/atom.xml +++ b/blog/categories/mqtt/atom.xml @@ -4,7 +4,7 @@ <![CDATA[Category: MQTT | Home Assistant]]> - 2016-04-22T14:56:12+00:00 + 2016-04-23T08:12:51+00:00 https://home-assistant.io/ diff --git a/blog/categories/organisation/atom.xml b/blog/categories/organisation/atom.xml index 22ecaf1cb0..1ad808b7a9 100644 --- a/blog/categories/organisation/atom.xml +++ b/blog/categories/organisation/atom.xml @@ -4,7 +4,7 @@ <![CDATA[Category: Organisation | Home Assistant]]> - 2016-04-22T14:56:12+00:00 + 2016-04-23T08:12:51+00:00 https://home-assistant.io/ diff --git a/blog/categories/public-service-announcement/atom.xml b/blog/categories/public-service-announcement/atom.xml index bb25278f37..a825e2d134 100644 --- a/blog/categories/public-service-announcement/atom.xml +++ b/blog/categories/public-service-announcement/atom.xml @@ -4,7 +4,7 @@ <![CDATA[Category: Public-Service-Announcement | Home Assistant]]> - 2016-04-22T14:56:12+00:00 + 2016-04-23T08:12:51+00:00 https://home-assistant.io/ diff --git a/blog/categories/release-notes/atom.xml b/blog/categories/release-notes/atom.xml index 42a16caf4d..d13825265c 100644 --- a/blog/categories/release-notes/atom.xml +++ b/blog/categories/release-notes/atom.xml @@ -4,7 +4,7 @@ <![CDATA[Category: Release-Notes | Home Assistant]]> - 2016-04-22T14:56:12+00:00 + 2016-04-23T08:12:51+00:00 https://home-assistant.io/ diff --git a/blog/categories/survey/atom.xml b/blog/categories/survey/atom.xml index 609157a91c..7fb43dd1ae 100644 --- a/blog/categories/survey/atom.xml +++ b/blog/categories/survey/atom.xml @@ -4,7 +4,7 @@ <![CDATA[Category: Survey | Home Assistant]]> - 2016-04-22T14:56:12+00:00 + 2016-04-23T08:12:51+00:00 https://home-assistant.io/ diff --git a/blog/categories/user-stories/atom.xml b/blog/categories/user-stories/atom.xml index e128410f20..ff2db203a1 100644 --- a/blog/categories/user-stories/atom.xml +++ b/blog/categories/user-stories/atom.xml @@ -4,7 +4,7 @@ <![CDATA[Category: User-Stories | Home Assistant]]> - 2016-04-22T14:56:12+00:00 + 2016-04-23T08:12:51+00:00 https://home-assistant.io/ diff --git a/blog/categories/website/atom.xml b/blog/categories/website/atom.xml index 86ce30398b..f8c0f08d59 100644 --- a/blog/categories/website/atom.xml +++ b/blog/categories/website/atom.xml @@ -4,7 +4,7 @@ <![CDATA[Category: Website | Home Assistant]]> - 2016-04-22T14:56:12+00:00 + 2016-04-23T08:12:51+00:00 https://home-assistant.io/ diff --git a/developers/development_environment/index.html b/developers/development_environment/index.html index 3aab99d290..acd61e40d9 100644 --- a/developers/development_environment/index.html +++ b/developers/development_environment/index.html @@ -115,6 +115,8 @@ $ script/setup +

Testing your work

+

Testing your work requires tox to be installed:

@@ -154,6 +156,22 @@ $ flake8 --install-hook
  • Follow these steps to create your pull request.
    • +

    Catching up with Reality

    + +

    If you’re taking a while developing your feature request and would like to catch up with what’s in the current Home Assistant dev branch, you can use git rebase to do so. This will pull the latest Home Assistant changes locally, rewind your commits, bring in the latest changes from Home Assistant and then replay all of your commits on top.

    + +
    + 
    # Run this from your feature branch
+$ git fetch upstream dev # to pull the latest changes into a local dev branch
+$ git rebase upstream/dev # to put those changes into your feature branch before your changes
+
    +
    +
    + +

    Squashing your commits

    + +

    Your feature is done, it looks great and the tests are all passing. What now? Squash your commits, and create a pull request. Squashing your commits makes for a more readable git commit history. It’s an interactive process that is best explained by Matt Stauffer in this video.

    +

    Further reading

      @@ -167,7 +185,6 @@ $ flake8 --install-hook
    - diff --git a/sitemap.xml b/sitemap.xml index b643377ded..5845bbce98 100644 --- a/sitemap.xml +++ b/sitemap.xml @@ -1488,18 +1488,18 @@ https://home-assistant.io/demo/frontend.html - 2016-04-22T14:55:28+00:00 + 2016-04-23T08:12:14+00:00 https://home-assistant.io/demo/index.html - 2016-04-22T14:55:28+00:00 + 2016-04-23T08:12:14+00:00 https://home-assistant.io/googlef4f3693c209fe788.html - 2016-04-22T14:55:28+00:00 + 2016-04-23T08:12:14+00:00 https://home-assistant.io/static/mdi-demo.html - 2016-04-22T14:55:28+00:00 + 2016-04-23T08:12:14+00:00