From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 31 Aug 2015 22:38:59 +0000 (-0700)
Subject: Merge branch 'jc/log-p-cc'
X-Git-Tag: v2.6.0-rc0~21
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/2ba6183b0b809ff10ec212e1f7b4c9f72fc076ae

Merge branch 'jc/log-p-cc'

"git log --cc" did not show any patch, even though most of the time
the user meant "git log --cc -p -m" to see patch output for commits
with a single parent, and combined diff for merge commits.  The
command is taught to DWIM "--cc" (without "--raw" and other forms
of output specification) to "--cc -p -m".

* jc/log-p-cc:
builtin/log.c: minor reformat
log: show merge commit when --cc is given
log: when --cc is given, default to -p unless told otherwise
log: rename "tweak" helpers
---

2ba6183b0b809ff10ec212e1f7b4c9f72fc076ae