| commit | d09f701146932facf0bb1eda1b6af2def291f3f0 | |
| author | Michael J Gruber <git@drmicha.warpmail.net> | |
| Fri, 10 Feb 2012 14:29:06 +0000 (10 15:29 +0100) | ||
| committer | Michael J Gruber <git@grubix.eu> | |
| Tue, 27 Aug 2019 12:46:18 +0000 (27 14:46 +0200) | ||
| tree | b9eaf6b964fde45823f0e45632b21c80e139a9c0 | treesnapshot (tar.gz zip) |
| parent | 914d0ccf976bfd2588de848e7bde5ab8c1272e2f | commitdiff |
merge: --no-verify to bypass pre-merge hook
Analogous to commit, introduce a '--no-verify' option which bypasses the
pre-merge hook. The shorthand '-n' is taken by the (non-existing)
'--no-stat' already.
Analogous to commit, introduce a '--no-verify' option which bypasses the
pre-merge hook. The shorthand '-n' is taken by the (non-existing)
'--no-stat' already.
| Documentation/git-merge.txt | diffblobblamehistory | |
| Documentation/githooks.txt | diffblobblamehistory | |
| Documentation/merge-options.txt | diffblobblamehistory | |
| builtin/merge.c | diffblobblamehistory |