diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2008-03-16 00:50:22 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-03-16 01:00:40 -0700 |
| commit | e637122ef2d3911568d7d016f723cdad61730069 (patch) | |
| tree | c0532c180529194f243c129f3380a75dc74e5ae3 | |
| parent | format-patch: generate MIME header as needed even when there is format.header (diff) | |
| download | tgif-e637122ef2d3911568d7d016f723cdad61730069.tar.xz | |
rebase -m: do not trigger pre-commit verification
When rebasing changes that contain issues that the pre-commit hook flags
as problematic, the rebase cannot be continued. However, rebase is about
transplanting commits that are already made with as little distortion as
possible, and pre-commit check should not interfere.
Earlier, c5b09fe (Avoid update hook during git-rebase --interactive,
2007-12-19) fixed "rebase -i", but "rebase -m" shared the same issue.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rwxr-xr-x | git-rebase.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/git-rebase.sh b/git-rebase.sh index 6b9af962a9..bc0c1c4abc 100755 --- a/git-rebase.sh +++ b/git-rebase.sh @@ -63,7 +63,7 @@ continue_merge () { cmt=`cat "$dotest/current"` if ! git diff-index --quiet HEAD -- then - if ! git-commit -C "$cmt" + if ! git commit --no-verify -C "$cmt" then echo "Commit failed, please do not call \"git commit\"" echo "directly, but instead do one of the following: " |