From f8e03b152b436d6034dd17e71335fc6221497571 Mon Sep 17 00:00:00 2001 From: Graham Percival Date: Sun, 11 Dec 2011 06:40:04 -0800 Subject: [PATCH] CG: add gitk to 'push to staging' instructions --- Documentation/contributor/source-code.itexi | 12 ++++++++++++ 1 file changed, 12 insertions(+) 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 -- 2.39.2