diff options
| author |  Johannes Schindelin <Johannes.Schindelin@gmx.de> | 2007-10-09 13:59:43 +0100 |
|---|---|---|
| committer |  Shawn O. Pearce <spearce@spearce.org> | 2007-10-15 21:16:08 -0400 |
| commit | f3d5e463f06c34716a9ce9d946e689377e9fda37 (patch) | |
| tree | b603c118d9e174f570ddaf0b30bf0e8e5f8247d4 /Documentation/git-merge-index.txt | |
| parent | Do not remove distributed configure script (diff) | |
| download | tgif-f3d5e463f06c34716a9ce9d946e689377e9fda37.tar.xz | |
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>
Diffstat (limited to 'Documentation/git-merge-index.txt')
0 files changed, 0 insertions, 0 deletions