summaryrefslogtreecommitdiff
path: root/combine-diff.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2013-04-02 15:10:49 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2013-04-02 15:10:49 -0700
commit68ef16b8488da1a9eed241340af194979d328ba7 (patch)
treecbc8de21d18cc473c503b08f0d6d3731652e440e /combine-diff.c
parentMerge branch 'tr/log-tree-optim' (diff)
parentlog: read gpg settings for signed commit verification (diff)
downloadtgif-68ef16b8488da1a9eed241340af194979d328ba7.tar.xz
Merge branch 'js/log-gpg'
Teach "show/log" honor gpg.program configuration just like other parts of the code that use GnuPG. * js/log-gpg: log: read gpg settings for signed commit verification
Diffstat (limited to 'combine-diff.c')
0 files changed, 0 insertions, 0 deletions