diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-07-10 01:25:38 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-07-10 01:25:39 +0300 |
| commit | 0af6d5dd062909eee3762e5fdec873ba6e7754b4 (patch) | |
| tree | 0612dd59979cb5060fe6dd345c9e0d373f1e75ee /Documentation/git-merge.txt | |
| parent | e8d259064146f24abb1280aff0ca3ead20218244 (diff) | |
| parent | 437591a9d738b56141149c9293c3b4840f5302f0 (diff) | |
Merge branch 'pw/doc-synopsis-markup-opmode-options'
Docfix.
* pw/doc-synopsis-markup-opmode-options:
show --continue/skip etc. consistently in synopsis
Diffstat (limited to 'Documentation/git-merge.txt')
| -rw-r--r-- | Documentation/git-merge.txt | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt index c01cfa6595..3ff0393507 100644 --- a/Documentation/git-merge.txt +++ b/Documentation/git-merge.txt @@ -13,8 +13,7 @@ SYNOPSIS [-s <strategy>] [-X <strategy-option>] [-S[<keyid>]] [--[no-]allow-unrelated-histories] [--[no-]rerere-autoupdate] [-m <msg>] [-F <file>] [<commit>...] -'git merge' --abort -'git merge' --continue +'git merge' (--continue | --abort | --quit) DESCRIPTION ----------- |