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 /merge-options.txt | |
| parent | 926cc052d4e49ae0c1af3703c87b0d1037d7fbac (diff) | |
| download | git-htmldocs-cb705397f111dc1fcb3e3fa844bfd5b3050dee38.tar.gz | |
Autogenerated HTML docs for v2.23.0-256-g4c861
Diffstat (limited to 'merge-options.txt')
| -rw-r--r-- | merge-options.txt | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/merge-options.txt b/merge-options.txt index 79a00d2a4..d6a9f4b96 100644 --- a/merge-options.txt +++ b/merge-options.txt @@ -105,6 +105,10 @@ option can be used to override --squash. + With --squash, --commit is not allowed, and will fail. +--no-verify:: + This option bypasses the pre-merge and commit-msg hooks. + See also linkgit:githooks[5]. + -s <strategy>:: --strategy=<strategy>:: Use the given merge strategy; can be supplied more than |