summaryrefslogtreecommitdiffstats
path: root/git-pull.html
diff options
context:
space:
mode:
authorJunio C Hamano <junio@hera.kernel.org>2008-12-10 08:35:25 +0000
committerJunio C Hamano <junio@hera.kernel.org>2008-12-10 08:35:25 +0000
commitec87f52676ecc7be43d1d7740a679a42b3192a01 (patch)
treeb8f74c54892b5aab6da3073eafc5216d05a2c174 /git-pull.html
parentb4028862764a27387da066ed28437f51376835cd (diff)
downloadgit-htmldocs-ec87f52676ecc7be43d1d7740a679a42b3192a01.tar.gz
Autogenerated HTML docs for v1.6.1-rc2-14-g5363d
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 5887da43b..933a0bfb7 100644
--- a/git-pull.html
+++ b/git-pull.html
@@ -375,7 +375,7 @@ when merging local branches into the current branch.</p></div>
</dt>
<dd>
<p>
- Do not show diffstat at the end of the merge.
+ Do not show a diffstat at the end of the merge.
</p>
</dd>
<dt>
@@ -1177,7 +1177,7 @@ Junio C Hamano and the git-list &lt;git@vger.kernel.org&gt;.</p></div>
</div>
<div id="footer">
<div id="footer-text">
-Last updated 2008-11-28 06:26:52 UTC
+Last updated 2008-12-10 08:33:22 UTC
</div>
</div>
</body>