]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'tr/am--no-verify'
authorJunio C Hamano <gitster@pobox.com>
Mon, 16 Jan 2023 20:07:46 +0000 (12:07 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 16 Jan 2023 20:07:46 +0000 (12:07 -0800)
Conditionally skip the pre-applypatch and applypatch-msg hooks when
applying patches with 'git am'.

* tr/am--no-verify:
  am: allow passing --no-verify flag

1  2 
builtin/am.c
t/t4150-am.sh

diff --cc builtin/am.c
Simple merge
diff --cc t/t4150-am.sh
Simple merge