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

[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  c2fa61e579d48615eda44362901e782b8a47db0d (commit)
      from  3d98f7076f7ada5d576eab80828f6014160395a9 (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=c2fa61e579d48615eda44362901e782b8a47db0d

commit c2fa61e579d48615eda44362901e782b8a47db0d
Author: Sylvain Beucler <address@hidden>
Date:   Wed Aug 12 08:55:51 2009 +0200

    Tip zeus about how to avoid messy Git merges :P

diff --git a/doc/HACKING b/doc/HACKING
index b2bb483..a827089 100644
--- a/doc/HACKING
+++ b/doc/HACKING
@@ -6,3 +6,19 @@ http://www.djangosnippets.org/snippets/549/
 
 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

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

Summary of changes:
 doc/HACKING |   16 ++++++++++++++++
 1 files changed, 16 insertions(+), 0 deletions(-)


hooks/post-receive
-- 
Savane-cleanup framework