diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-09-10 17:39:23 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-09-10 17:39:23 +0900 |
| commit | 88bf5716b2ea27d90ae93a2f12525a0e143e3b39 (patch) | |
| tree | 0ddd74fc574f9dc6ccd7667437b0f60b5fb6a94a /git-pull.html | |
| parent | bc39b7db11be3ba4e93e34f706b8a774e523bf1b (diff) | |
| download | git-htmldocs-88bf5716b2ea27d90ae93a2f12525a0e143e3b39.tar.gz | |
Autogenerated HTML docs for v2.14.1-536-g68672
Diffstat (limited to 'git-pull.html')
| -rw-r--r-- | git-pull.html | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/git-pull.html b/git-pull.html index 5ac6cf643..886a0edba 100644 --- a/git-pull.html +++ b/git-pull.html @@ -913,7 +913,7 @@ set to <code>no</code> at the beginning of them.</p></div> <dd>
<p>
Refuse to merge and exit with a non-zero status unless the
- current <code>HEAD</code> is already up-to-date or the merge can be
+ current <code>HEAD</code> is already up to date or the merge can be
resolved as a fast-forward.
</p>
</dd>
@@ -1980,7 +1980,7 @@ version.</p></div> <div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
-Last updated 2017-07-13 16:37:56 PDT
+Last updated 2017-07-14 08:37:56 JST
</div>
</div>
</body>
|