summaryrefslogtreecommitdiff
path: root/git-sh-setup.sh
diff options
context:
space:
mode:
authorLibravatar Johannes Schindelin <Johannes.Schindelin@gmx.de>2007-06-30 18:47:07 +0100
committerLibravatar Junio C Hamano <gitster@pobox.com>2007-07-03 19:05:55 -0700
commit72909befaa043fcc975115bb56d25a6e7dc65fb6 (patch)
tree6c0373991554e7fe72e9ec201be3a707ddb67e24 /git-sh-setup.sh
parentDocument git-filter-branch (diff)
downloadtgif-72909befaa043fcc975115bb56d25a6e7dc65fb6.tar.xz
Add diff-option --ext-diff
To prevent funky games with external diff engines, git-log and friends prevent external diff engines from being called. That makes sense in the context of git-format-patch or git-rebase. However, for "git log -p" it is not so nice to get the message that binary files cannot be compared, while "git diff" has no problems with them, if you provided an external diff driver. With this patch, "git log --ext-diff -p" will do what you expect, and the option "--no-ext-diff" can be used to override that setting. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-sh-setup.sh')
0 files changed, 0 insertions, 0 deletions