summaryrefslogtreecommitdiffstats
path: root/git-pull.html
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2017-06-30 14:49:53 -0700
committerJunio C Hamano <gitster@pobox.com>2017-06-30 14:49:53 -0700
commit967cda7cb7d2494c0cff6ebf0ad40fde587fb892 (patch)
tree53a75ad7da700bc405f2c40931a58f9fd39c6086 /git-pull.html
parent535c65caafa13821295c3b060a5acd98bd2557b7 (diff)
downloadgit-htmldocs-967cda7cb7d2494c0cff6ebf0ad40fde587fb892.tar.gz
Autogenerated HTML docs for v2.13.2-556-g5116f
Diffstat (limited to 'git-pull.html')
-rw-r--r--git-pull.html4
1 files changed, 2 insertions, 2 deletions
diff --git a/git-pull.html b/git-pull.html
index 6c8a60b0e..ae29cac3d 100644
--- a/git-pull.html
+++ b/git-pull.html
@@ -1087,7 +1087,7 @@ unless you have read <a href="git-rebase.html">git-rebase(1)</a> carefully.</td>
<dd>
<p>
Before starting rebase, stash local modifications away (see
- <a href="git-stash.html">git-stash(1)</a>) if needed, and apply the stash when
+ <a href="git-stash.html">git-stash(1)</a>) if needed, and apply the stash entry when
done. <code>--no-autostash</code> is useful to override the <code>rebase.autoStash</code>
configuration variable (see <a href="git-config.html">git-config(1)</a>).
</p>
@@ -1982,7 +1982,7 @@ version.</p></div>
<div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
-Last updated 2017-06-05 11:16:08 JST
+Last updated 2017-06-30 14:49:23 PDT
</div>
</div>
</body>