diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-07-18 13:16:48 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-07-18 13:16:48 -0700 |
| commit | ea1ac8d6d6d8856d448e1f6e2d941f7663dc9ecd (patch) | |
| tree | 50a7bda536235313b6288988e779c75bc53970e5 /git-notes.html | |
| parent | ec40f134aa677499a0c1bf7ea6133b7b5fe348c4 (diff) | |
| download | git-htmldocs-ea1ac8d6d6d8856d448e1f6e2d941f7663dc9ecd.tar.gz | |
Autogenerated HTML docs for v2.18.0-232-gb7bd94
Diffstat (limited to 'git-notes.html')
| -rw-r--r-- | git-notes.html | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/git-notes.html b/git-notes.html index 2441cd168..0222b988e 100644 --- a/git-notes.html +++ b/git-notes.html @@ -1069,7 +1069,7 @@ get-ref </dt>
<dd>
<p>
- Abort/reset a in-progress <em>git notes merge</em>, i.e. a notes merge
+ Abort/reset an in-progress <em>git notes merge</em>, i.e. a notes merge
with conflicts. This simply removes all files related to the
notes merge.
</p>
@@ -1344,7 +1344,7 @@ on the <code>notes.rewrite.<command></code> and <code>notes.rewriteRef</co <div id="footer">
<div id="footer-text">
Last updated
- 2018-01-26 15:11:04 PST
+ 2018-07-18 13:16:04 PDT
</div>
</div>
</body>
|