Reword rebase stuff

Signed-off-by: Chris Warrick <kwpolska@gmail.com>
getnikola · Feb 19, 2017 · 192fbc5 · 192fbc5
1 parent 8dd13e3
commit 192fbc5
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst
@@ -35,7 +35,9 @@ Here are some guidelines about how you can contribute to Nikola:
   <http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html>`_.
   It’s not necessary, but if you are doing something big, we recommend
   describing it in the commit message.
-* While working, rebase instead of merging (if possible).
+* While working, rebase instead of merging (if possible). You can use rebase
+  instead of merge by default with ``git config pull.rebase true``. If rebases
+  fail, you can just use ``git pull --no-rebase``.
 * **Make sure documentation is updated** — at the very least, keep docstrings
   current, and if necessary, update the reStructuredText documentation in ``docs/``.
 * **Add a CHANGELOG entry** at the *top* of ``CHANGES.txt`` mentioning issue number