summaryrefslogtreecommitdiff
path: root/t/t3304-notes-mixed.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2015-08-20 14:36:49 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2015-08-20 15:06:04 -0700
commit82dee4160cc6d1b0d792c9f07b5803cd42abc610 (patch)
treeae44a892546c7fbb3ce9ee37805791eb8d5aa52e /t/t3304-notes-mixed.sh
parentlog: when --cc is given, default to -p unless told otherwise (diff)
downloadtgif-82dee4160cc6d1b0d792c9f07b5803cd42abc610.tar.xz
log: show merge commit when --cc is given
We defaulted to ignoring merge diffs because long long ago, in a galaxy far away, we didn't have a great way to show the diffs. The whole "--cc" option goes back to January '06 and commit d8f4790e6fe7 ("diff-tree --cc: denser combined diff output for a merge commit"). And before that option - so for about 8 months - we had no good way to show the diffs of merges in a good dense way. So the whole "don't show diffs for merges by default" actually made a lot of sense originally, because our merge diffs were not very useful. And this was carried forward to this day. "git log --cc" still ignores merge commits, and you need to say "git log -m --cc" to view a sensible rendition of merge and non-merge commits, even with the previous change to make "--cc" imply "-p". Teach "git log" that "--cc" means the user wants to see interesting changes in merge commits by turning "-m" on. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t3304-notes-mixed.sh')
0 files changed, 0 insertions, 0 deletions