--- Documentation/git-stash.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/Documentation/git-stash.txt b/Documentation/git-stash.txt index 70191d06b69e..3899d36b2bab 100644 --- a/Documentation/git-stash.txt +++ b/Documentation/git-stash.txt @@ -233,7 +233,7 @@ return to your original branch to make the emergency fix, like this: $ git checkout -b my_wip $ git commit -a -m "WIP" $ git checkout master -$ edit emergency fix +# ... edit emergency fix ... $ git commit -a -m "Fix in a hurry" $ git checkout my_wip $ git reset --soft HEAD^ @@ -245,7 +245,7 @@ You can use 'git stash' to simplify the above, like this: ---------------------------------------------------------------- # ... hack hack hack ... $ git stash -$ edit emergency fix +# ... edit emergency fix ... $ git commit -a -m "Fix in a hurry" $ git stash pop # ... continue hacking ... @@ -261,11 +261,11 @@ each change before committing: # ... hack hack hack ... $ 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 +# ... edit, build and test first part ... $ git commit -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 +# ... edit, build and test remaining parts ... $ git commit foo -m 'Remaining parts' ---------------------------------------------------------------- -- https://github.com/git/git/pull/361
