Mercurial > hg > savane-forge

changeset 136:e05c2c20a61a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix rebase instructions (worked for branches apparently, not when pulling the current branch)
author Sylvain Beucler <beuc@beuc.net>
date Wed, 12 Aug 2009 10:21:26 +0200 (2009-08-12)
parents 92e789878e81
children 96e385b43a67
files doc/HACKING
diffstat 1 files changed, 6 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/doc/HACKING
+++ b/doc/HACKING
@@ -14,11 +14,13 @@
 Do avoid messy merges whenever you forgot to make a 'git pull' before
 starting to work, check:
 
-  git config branch.autosetuprebase always
+  git config branch.master.rebase true
 
 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:
+Beware that rebase can be a dangerous tool - better issue a 'gitk'
+before pushing, as a rule of the thumb, and rebase as necessary.
+
+More in-depth explanation with examples (though the author works on a
+fork, not on the project master branch):
 - http://www.gitready.com/advanced/2009/02/11/pull-with-rebase.html