[Savannah-cvs] [SCM] Savane-cleanup framework branch, master, updated. 0860e68a847272ced4cad82fed1e5dd26fab3c1b

[Sylvain Beucler]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Savane-cleanup framework".

The branch, master has been updated
       via  0860e68a847272ced4cad82fed1e5dd26fab3c1b (commit)
      from  c2fa61e579d48615eda44362901e782b8a47db0d (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit/savane-cleanup/framework.git/commit/?id=0860e68a847272ced4cad82fed1e5dd26fab3c1b

commit 0860e68a847272ced4cad82fed1e5dd26fab3c1b
Author: Sylvain Beucler <address@hidden>
Date:   Wed Aug 12 10:21:26 2009 +0200

    Fix rebase instructions (worked for branches apparently, not when pulling 
the current branch)

diff --git a/doc/HACKING b/doc/HACKING
index a827089..eb125fe 100644
--- a/doc/HACKING
+++ b/doc/HACKING
@@ -14,11 +14,13 @@ Git
 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

-----------------------------------------------------------------------

Summary of changes:
 doc/HACKING |   10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
Savane-cleanup framework