Documentation: fix disappeared lines in 'git stash' manpage
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>
SZEDER Gábor committed
Sep 2, 2008 at 03:35 UTC
9da6f0fff2d6ab4bfad36099b53c911bc498fc2e
1 file changed
+7
-7
Documentation/git-stash.txt
+7
-7
@@ -159,7 +159,7 @@ perform a pull, and then unstash, like this:
159
+
160
----------------------------------------------------------------
161
$ git pull
162
-...
162
+ ...
163
file foobar not up to date, cannot merge.
164
$ git stash
165
$ git pull
@@ -174,7 +174,7 @@ make a commit to a temporary branch to store your changes away, and
174
return to your original branch to make the emergency fix, like this:
175
+
176
----------------------------------------------------------------
177
-... hack hack hack ...
177
+# ... hack hack hack ...
178
$ git checkout -b my_wip
179
$ git commit -a -m "WIP"
180
$ git checkout master
@@ -182,18 +182,18 @@ $ edit emergency fix
182
$ git commit -a -m "Fix in a hurry"
183
$ git checkout my_wip
184
$ git reset --soft HEAD^
185
-... continue hacking ...
185
+# ... continue hacking ...
186
----------------------------------------------------------------
187
+
188
You can use 'git-stash' to simplify the above, like this:
189
+
190
----------------------------------------------------------------
191
-... hack hack hack ...
191
+# ... hack hack hack ...
192
$ git stash
193
$ edit emergency fix
194
$ git commit -a -m "Fix in a hurry"
195
$ git stash apply
196
-... continue hacking ...
196
+# ... continue hacking ...
197
----------------------------------------------------------------
198
199
Testing partial commits::
@@ -203,13 +203,13 @@ more commits out of the changes in the work tree, and you want to test
203
each change before committing:
204
+
205
----------------------------------------------------------------
206
-... hack hack hack ...
206
+# ... hack hack hack ...
207
$ git add --patch foo # add just first part to the index
208
$ git stash save --keep-index # save all other changes to the stash
209
$ edit/build/test first part
210
$ git commit foo -m 'First part' # commit fully tested change
211
$ git stash pop # prepare to work on all other changes
212
-... repeat above five steps until one commit remains ...
212
+# ... repeat above five steps until one commit remains ...
213
$ edit/build/test remaining parts
214
$ git commit foo -m 'Remaining parts'
215
----------------------------------------------------------------