summaryrefslogtreecommitdiff
path: root/gpg-interface.h
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2015-08-31 15:38:59 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2015-08-31 15:38:59 -0700
commit2ba6183b0b809ff10ec212e1f7b4c9f72fc076ae (patch)
tree3dac9e02ca6ab1f7e03fae8514777b8e49377065 /gpg-interface.h
parentMerge branch 'jk/fix-alias-pager-config-key-warnings' (diff)
parentbuiltin/log.c: minor reformat (diff)
downloadtgif-2ba6183b0b809ff10ec212e1f7b4c9f72fc076ae.tar.xz
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
Diffstat (limited to 'gpg-interface.h')
0 files changed, 0 insertions, 0 deletions