diff options
| author | Junio C Hamano <junio@hera.kernel.org> | 2008-09-03 05:20:31 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@hera.kernel.org> | 2008-09-03 05:20:31 +0000 |
| commit | a2f4662f592080968a8ce848d3e5d84003a6c20d (patch) | |
| tree | f7fea594067a02e897e4313d2dee074f96797138 /git-stash.html | |
| parent | 17bd22710392bb8cd5d7cb26eb6d2eff19feca96 (diff) | |
| download | git-htmldocs-a2f4662f592080968a8ce848d3e5d84003a6c20d.tar.gz | |
Autogenerated HTML docs for v1.6.0.1-196-g0191
Diffstat (limited to 'git-stash.html')
| -rw-r--r-- | git-stash.html | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/git-stash.html b/git-stash.html index 22a945fde..dabe8c286 100644 --- a/git-stash.html +++ b/git-stash.html @@ -504,7 +504,7 @@ perform a pull, and then unstash, like this:</p></div> <div class="listingblock">
<div class="content">
<pre><tt>$ git pull
-...
+ ...
file foobar not up to date, cannot merge.
$ git stash
$ git pull
@@ -523,7 +523,7 @@ return to your original branch to make the emergency fix, like this: </p>
<div class="listingblock">
<div class="content">
-<pre><tt>... hack hack hack ...
+<pre><tt># ... hack hack hack ...
$ git checkout -b my_wip
$ git commit -a -m "WIP"
$ git checkout master
@@ -531,17 +531,17 @@ $ edit emergency fix $ git commit -a -m "Fix in a hurry"
$ git checkout my_wip
$ git reset --soft HEAD^
-... continue hacking ...</tt></pre>
+# ... continue hacking ...</tt></pre>
</div></div>
<div class="para"><p>You can use <em>git-stash</em> to simplify the above, like this:</p></div>
<div class="listingblock">
<div class="content">
-<pre><tt>... hack hack hack ...
+<pre><tt># ... hack hack hack ...
$ git stash
$ edit emergency fix
$ git commit -a -m "Fix in a hurry"
$ git stash apply
-... continue hacking ...</tt></pre>
+# ... continue hacking ...</tt></pre>
</div></div>
</dd>
<dt>
@@ -555,13 +555,13 @@ each change before committing: </p>
<div class="listingblock">
<div class="content">
-<pre><tt>... hack hack hack ...
+<pre><tt># ... 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
-$ git commit foo -m 'First part' # commit fully tested change
+$ 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 ...
+# ... repeat above five steps until one commit remains ...
$ edit/build/test remaining parts
$ git commit foo -m 'Remaining parts'</tt></pre>
</div></div>
@@ -585,7 +585,7 @@ $ git commit foo -m 'Remaining parts'</tt></pre> </div>
<div id="footer">
<div id="footer-text">
-Last updated 2008-08-16 10:22:58 UTC
+Last updated 2008-09-03 05:20:00 UTC
</div>
</div>
</body>
|