| commit | c5b09feb786f6a2456ec3d8203d0f4d67f09f043 | |
| author | Shawn O. Pearce <spearce@spearce.org> | |
| Wed, 19 Dec 2007 06:41:26 +0000 (19 01:41 -0500) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 20 Dec 2007 01:15:38 +0000 (19 17:15 -0800) | ||
| tree | 6c23d289f235a264219fe89be69bf01dff380299 | treesnapshot (tar.gz zip) |
| parent | 20b178de7b20a0ebf02b8da3b4791c06fc8e3a63 | commitdiff |
Avoid update hook during git-rebase --interactive
If we are rebasing changes that contain potential whitespace
errors that our .git/hooks/pre-commit hook looks for and fails
on then git-commit will fail to commit that change. This causes
git-rebase--interactive to squash commits together, even though it
was not requested to do so by the todo file.
Passing --no-verify to git-commit makes git-rebase -i behave more
like git-rebase normally would in such conditions, providing more
consistent behavior between the different rebase implementations.
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
If we are rebasing changes that contain potential whitespace
errors that our .git/hooks/pre-commit hook looks for and fails
on then git-commit will fail to commit that change. This causes
git-rebase--interactive to squash commits together, even though it
was not requested to do so by the todo file.
Passing --no-verify to git-commit makes git-rebase -i behave more
like git-rebase normally would in such conditions, providing more
consistent behavior between the different rebase implementations.
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| git-rebase--interactive.sh | diffblobblamehistory |