Mercurial > hg > savane-forge

changeset 135:92e789878e81

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Tip zeus about how to avoid messy Git merges :P
author Sylvain Beucler <beuc@beuc.net>
date Wed, 12 Aug 2009 08:55:51 +0200
parents ce698eb0e43b
children e05c2c20a61a
files doc/HACKING
diffstat 1 files changed, 16 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/doc/HACKING
+++ b/doc/HACKING
@@ -6,3 +6,19 @@
 
 This requires IPython, which adds completion and other niceties to the
 Python shell.
+
+
+Git
+===
+
+Do avoid messy merges whenever you forgot to make a 'git pull' before
+starting to work, check:
+
+  git config branch.autosetuprebase always
+
+This makes your latest changes much clearer.
+
+Source:
+- http://tumbl.strelau.net/post/47338904/git-pull-rebase-by-default
+More in-depth explanation with examples:
+- http://www.gitready.com/advanced/2009/02/11/pull-with-rebase.html