aboutsummaryrefslogtreecommitdiff
path: root/combine-diff.c
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-02-05 16:37:18 -0800
committerJunio C Hamano <junkio@cox.net>2006-02-05 16:37:18 -0800
commitdf9892ffce46d1f1bd6fe64aa445be2ffe7346cf (patch)
treee842e14e04b504cebdb1808ec48219dcbda9bcfd /combine-diff.c
parent4abd89648eb40384556e2118e74be03325d0b05d (diff)
downloadgit-df9892ffce46d1f1bd6fe64aa445be2ffe7346cf.tar.gz
git-df9892ffce46d1f1bd6fe64aa445be2ffe7346cf.tar.xz
git-diff: use --cc instead of -p.
The --cc output is much nicer when dealing with merges, so use it by default. Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'combine-diff.c')
0 files changed, 0 insertions, 0 deletions