| commit | f3d5e463f06c34716a9ce9d946e689377e9fda37 | |
| author | Johannes Schindelin <Johannes.Schindelin@gmx.de> | |
| Tue, 9 Oct 2007 12:59:43 +0000 (9 13:59 +0100) | ||
| committer | Shawn O. Pearce <spearce@spearce.org> | |
| Tue, 16 Oct 2007 01:16:08 +0000 (15 21:16 -0400) | ||
| tree | b603c118d9e174f570ddaf0b30bf0e8e5f8247d4 | treesnapshot (tar.gz zip) |
| parent | 922aa807f5fee97fcb2ccd1d1db63b59bdd02128 | commitdiff |
rebase -i: use diff plumbing instead of porcelain
When diff drivers are installed, calling "git diff <tree1>..<tree2>"
calls those drivers. This borks the patch generation of rebase -i.
So use "git diff-tree -p" instead, which does not call diff drivers.
Noticed by Johannes Sixt.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
When diff drivers are installed, calling "git diff <tree1>..<tree2>"
calls those drivers. This borks the patch generation of rebase -i.
So use "git diff-tree -p" instead, which does not call diff drivers.
Noticed by Johannes Sixt.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
| git-rebase--interactive.sh | diffblobblamehistory |