diff options
Diffstat (limited to 'third_party/git/Documentation/git-merge.txt')
| -rw-r--r-- | third_party/git/Documentation/git-merge.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/third_party/git/Documentation/git-merge.txt b/third_party/git/Documentation/git-merge.txt index 092529c619e2..01fd52dc7063 100644 --- a/third_party/git/Documentation/git-merge.txt +++ b/third_party/git/Documentation/git-merge.txt @@ -10,7 +10,7 @@ SYNOPSIS -------- [verse] 'git merge' [-n] [--stat] [--no-commit] [--squash] [--[no-]edit] - [--no-verify] [-s <strategy>] [-X <strategy-option>] [-S[<keyid>]] + [-s <strategy>] [-X <strategy-option>] [-S[<keyid>]] [--[no-]allow-unrelated-histories] [--[no-]rerere-autoupdate] [-m <msg>] [-F <file>] [<commit>...] 'git merge' (--continue | --abort | --quit) |