Tomas Mlcoch 291c509c2f Doc: Replace fetch & fetch tags & merge combo with pull --rebase ... $ git pull --rebase upstream master will work also when there are commits on master branch - it will just rebase the changes seamlessly in opposite to git merge. Moreover by using git pull --rebase we will save two calls of git.		2015-09-09 03:58:30 -04:00
..
_static	Rewrite documentation to Sphinx.	2015-07-02 09:18:49 -04:00
_templates	Rewrite documentation to Sphinx.	2015-07-02 09:18:49 -04:00
about.rst	Rewrite documentation to Sphinx.	2015-07-02 09:18:49 -04:00
conf.py	Rewrite documentation to Sphinx.	2015-07-02 09:18:49 -04:00
configuration.rst	Add image-build support	2015-09-01 08:03:34 +00:00
contributing.rst	Doc: Replace fetch & fetch tags & merge combo with pull --rebase	2015-09-09 03:58:30 -04:00
index.rst	Document configuration options.	2015-07-10 07:47:29 -04:00
Makefile	Rewrite documentation to Sphinx.	2015-07-02 09:18:49 -04:00
testing.rst	Rewrite documentation to Sphinx.	2015-07-02 09:18:49 -04:00