From: Eric Raible <raible@gmail.com>
Date: Tue, 8 Jul 2008 07:40:56 +0000 (-0700)
Subject: Documentation: tweak use case in "git stash save --keep-index"
X-Git-Tag: v1.6.0-rc0~87^2
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=caf1899699b2255111a3db335553e31f3718c1c9;p=git.git

Documentation: tweak use case in "git stash save --keep-index"

The documentation suggests using "git stash apply" in the
--keep-index workflow even though doing so will lead to clutter
in the stash.  And given that the changes are about to be
committed anyway "git stash pop" is more sensible.

Additionally the text preceeding the example claims that it
works for "two or more commits", but the example itself is
really tailored for just two.  Expanding it just a little
makes it clear how the procedure generalizes to N commits.

Finally the example is annotated with some commentary to
explain things on a line-by-line basis.
---

diff --git a/Documentation/git-stash.txt b/Documentation/git-stash.txt
index 8f331ee7d..e2c872237 100644
--- a/Documentation/git-stash.txt
+++ b/Documentation/git-stash.txt
@@ -180,13 +180,14 @@ each change before committing:
 +
 ----------------------------------------------------------------
 ... hack hack hack ...
-$ git add --patch foo
-$ git stash save --keep-index
-$ build && run tests
-$ git commit -m 'First part'
-$ git stash apply
-$ build && run tests
-$ git commit -a -m 'Second part'
+$ git add --patch foo            # add just first part to the index
+$ git stash save --keep-index    # save all other changes to the stash
+$ edit/build/test first part
+$ git commit foo -m 'First part' # commit fully tested change
+$ git stash pop                  # prepare to work on all other changes
+... repeat above five steps until one commit remains ...
+$ edit/build/test remaining parts
+$ git commit foo -m 'Remaining parts'
 ----------------------------------------------------------------
 
 SEE ALSO