diff options
| author | Ville Skyttä <ville.skytta@iki.fi> | 2018-06-22 09:50:37 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-06-23 00:26:23 +0300 |
| commit | 928f0ab4bae61954c27a77794d80c2332c8e816c (patch) | |
| tree | 786977d843634899a64cecd6f51fcf669062035f /Documentation/git-notes.txt | |
| parent | 53f9a3e157dbbc901a02ac2c73346d375e24978c (diff) | |
Documentation: spelling and grammar fixes
Signed-off-by: Ville Skyttä <ville.skytta@iki.fi>
Reviewed-by: Eric Sunshine <sunshine@sunshineco.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-notes.txt')
| -rw-r--r-- | Documentation/git-notes.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/git-notes.txt b/Documentation/git-notes.txt index e8dec1b3c8..df2b64dbb6 100644 --- a/Documentation/git-notes.txt +++ b/Documentation/git-notes.txt @@ -199,7 +199,7 @@ OPTIONS .git/NOTES_MERGE_REF symref is updated to the resulting commit. --abort:: - Abort/reset a in-progress 'git notes merge', i.e. a notes merge + Abort/reset an in-progress 'git notes merge', i.e. a notes merge with conflicts. This simply removes all files related to the notes merge. |