If your cherry-pick
(without --no-commit
) had merge conflicts and you want to --continue
after solving them, you can temporarily disable git hooks for the current repo with:
$ git config core.hooksPath # Print current setting
$ git config core.hooksPath '/dev/null/'
After you’re done, depending on whether core.hooksPath
was set before, you can either restore the previous setting:
$ git config core.hooksPath '/some/previous/path'
or unset it again:
$ git config --unset core.hooksPath