diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-09-18 12:30:01 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-09-18 12:30:01 -0700 |
| commit | cb705397f111dc1fcb3e3fa844bfd5b3050dee38 (patch) | |
| tree | 7a08f9890ae401f03a3d3fb034c06f1be74e727e /git-merge.txt | |
| parent | 926cc052d4e49ae0c1af3703c87b0d1037d7fbac (diff) | |
| download | git-htmldocs-cb705397f111dc1fcb3e3fa844bfd5b3050dee38.tar.gz | |
Autogenerated HTML docs for v2.23.0-256-g4c861
Diffstat (limited to 'git-merge.txt')
| -rw-r--r-- | git-merge.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/git-merge.txt b/git-merge.txt index 01fd52dc7..092529c61 100644 --- a/git-merge.txt +++ b/git-merge.txt @@ -10,7 +10,7 @@ SYNOPSIS -------- [verse] 'git merge' [-n] [--stat] [--no-commit] [--squash] [--[no-]edit] - [-s <strategy>] [-X <strategy-option>] [-S[<keyid>]] + [--no-verify] [-s <strategy>] [-X <strategy-option>] [-S[<keyid>]] [--[no-]allow-unrelated-histories] [--[no-]rerere-autoupdate] [-m <msg>] [-F <file>] [<commit>...] 'git merge' (--continue | --abort | --quit) |