diff options
author | Shawn O. Pearce <spearce@spearce.org> | 2007-12-19 01:41:26 -0500 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2007-12-19 17:15:38 -0800 |
commit | c5b09feb786f6a2456ec3d8203d0f4d67f09f043 (patch) | |
tree | 6c23d289f235a264219fe89be69bf01dff380299 /Documentation/git-name-rev.txt | |
parent | Improved submodule merge support (diff) | |
download | tgif-c5b09feb786f6a2456ec3d8203d0f4d67f09f043.tar.xz |
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>
Diffstat (limited to 'Documentation/git-name-rev.txt')
0 files changed, 0 insertions, 0 deletions