undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Documentation: fix disappeared lines in 'git stash' manpage

Browse Source 
Asciidoc removes lines starting with a dot when creating manpages.
Since those lines were comments in use case examples showing shell
commands, preceed those lines with a hash sign.

Signed-off-by: SZEDER Gábor <szeder@ira.uka.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
SZEDER Gábor 2008-09-02 03:35:24 +02:00 committed by Junio C Hamano
parent d4040e0a17
commit 9da6f0fff2
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Documentation/git-stash.txt
View File

@ -159,7 +159,7 @@ perform a pull, and then unstash, like this:
+ +
---------------------------------------------------------------- ----------------------------------------------------------------
$ git pull $ git pull
... ...
file foobar not up to date, cannot merge. file foobar not up to date, cannot merge.
$ git stash $ git stash
$ git pull $ git pull
@ -174,7 +174,7 @@ make a commit to a temporary branch to store your changes away, and
return to your original branch to make the emergency fix, like this: return to your original branch to make the emergency fix, like this:
+ +
---------------------------------------------------------------- ----------------------------------------------------------------
... hack hack hack ... # ... hack hack hack ...
$ git checkout -b my_wip $ git checkout -b my_wip
$ git commit -a -m "WIP" $ git commit -a -m "WIP"
$ git checkout master $ git checkout master
@ -182,18 +182,18 @@ $ edit emergency fix
$ git commit -a -m "Fix in a hurry" $ git commit -a -m "Fix in a hurry"
$ git checkout my_wip $ git checkout my_wip
$ git reset --soft HEAD^ $ git reset --soft HEAD^
... continue hacking ... # ... continue hacking ...
---------------------------------------------------------------- ----------------------------------------------------------------
+ +
You can use 'git-stash' to simplify the above, like this: You can use 'git-stash' to simplify the above, like this:
+ +
---------------------------------------------------------------- ----------------------------------------------------------------
... hack hack hack ... # ... hack hack hack ...
$ git stash $ git stash
$ edit emergency fix $ edit emergency fix
$ git commit -a -m "Fix in a hurry" $ git commit -a -m "Fix in a hurry"
$ git stash apply $ git stash apply
... continue hacking ... # ... continue hacking ...
---------------------------------------------------------------- ----------------------------------------------------------------
Testing partial commits:: Testing partial commits::
@ -203,13 +203,13 @@ more commits out of the changes in the work tree, and you want to test
each change before committing: each change before committing:
+ +
---------------------------------------------------------------- ----------------------------------------------------------------
... hack hack hack ... # ... hack hack hack ...
$ git add --patch foo # add just first part to the index $ git add --patch foo # add just first part to the index
$ git stash save --keep-index # save all other changes to the stash $ git stash save --keep-index # save all other changes to the stash
$ edit/build/test first part $ edit/build/test first part
$ git commit foo -m 'First part' # commit fully tested change $ git commit foo -m 'First part' # commit fully tested change
$ git stash pop # prepare to work on all other changes $ git stash pop # prepare to work on all other changes
... repeat above five steps until one commit remains ... # ... repeat above five steps until one commit remains ...
$ edit/build/test remaining parts $ edit/build/test remaining parts
$ git commit foo -m 'Remaining parts' $ git commit foo -m 'Remaining parts'
---------------------------------------------------------------- ----------------------------------------------------------------