From: Graham Percival <graham@percival-music.ca>
Date: Sun, 11 Dec 2011 14:40:04 +0000 (-0800)
Subject: CG: add gitk to 'push to staging' instructions
X-Git-Tag: release/2.15.22-1~17
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=f8e03b152b436d6034dd17e71335fc6221497571;p=lilypond.git

CG: add gitk to 'push to staging' instructions
---

diff --git a/Documentation/contributor/source-code.itexi b/Documentation/contributor/source-code.itexi
index de292c99f6..3f964f93a4 100644
--- a/Documentation/contributor/source-code.itexi
+++ b/Documentation/contributor/source-code.itexi
@@ -1681,10 +1681,16 @@ do:
 git checkout staging
 git pull -r
 git am 0001-my-patch.patch
+gitk
 git push origin staging
 git checkout master
 @end example
 
+@warning{Do not skip the @command{gitk} step; a quick 5-second
+check of the visual history can save a great deal of frustration
+later on.  You should only see that @command{staging} is only 1
+commit ahead of @code{origin/staging}.}
+
 @subsubheading If your work is in a branch
 
 If you are working on branches and your work in is
@@ -1694,9 +1700,15 @@ If you are working on branches and your work in is
 git checkout staging
 git pull -r
 git merge my_branch_name
+gitk
 git push origin staging
 @end example
 
+@warning{Do not skip the @command{gitk} step; a quick 5-second
+check of the visual history can save a great deal of frustration
+later on.  You should see that @code{staging} is only ahead of
+@code{origin/staging} by the commits from your branch.}
+
 
 
 @node Git on Windows