Junio C Hamano 5de89d3abf Merge branch 'jc/show-sig' ... * jc/show-sig: log --show-signature: reword the common two-head merge case log-tree: show mergetag in log --show-signature output log-tree.c: small refactor in show_signature() commit --amend -S: strip existing gpgsig headers verify_signed_buffer: fix stale comment gpg-interface: allow use of a custom GPG binary pretty: %G[?GS] placeholders test "commit -S" and "log --show-signature" log: --show-signature commit: teach --gpg-sign option Conflicts: builtin/commit-tree.c builtin/commit.c builtin/merge.c notes-cache.c pretty.c		2012-01-06 12:44:07 -08:00
..
add.c
annotate.c
apply.c	Merge branch 'bc/maint-apply-check-no-patch' into maint	2011-12-21 11:42:45 -08:00
archive.c
bisect--helper.c
blame.c
branch.c	Merge branch 'jn/branch-move-to-self' into maint	2011-12-28 11:32:33 -08:00
bundle.c
cat-file.c
check-attr.c
check-ref-format.c
checkout-index.c
checkout.c	Merge branch 'jc/checkout-m-twoway' into maint	2011-12-28 11:44:54 -08:00
clean.c
clone.c	clone: the -o option has nothing to do with <branch>	2011-12-21 11:26:30 -08:00
commit-tree.c	Merge branch 'jc/show-sig'	2012-01-06 12:44:07 -08:00
commit.c	Merge branch 'jc/show-sig'	2012-01-06 12:44:07 -08:00
config.c	Merge branch 'jv/maint-config-set' into maint	2011-12-28 12:03:19 -08:00
count-objects.c
describe.c
diff-files.c
diff-index.c
diff-tree.c
diff.c
fast-export.c
fetch-pack.c
fetch.c	write first for-merge ref to FETCH_HEAD first	2012-01-03 16:13:14 -08:00
fmt-merge-msg.c
for-each-ref.c
fsck.c
gc.c
grep.c
hash-object.c
help.c
index-pack.c
init-db.c
log.c	Sync with v1.7.8.1	2011-12-21 12:02:44 -08:00
ls-files.c
ls-remote.c
ls-tree.c
mailinfo.c
mailsplit.c
merge-base.c
merge-file.c
merge-index.c
merge-ours.c
merge-recursive.c
merge-tree.c
merge.c	Merge branch 'jc/show-sig'	2012-01-06 12:44:07 -08:00
mktag.c
mktree.c
mv.c	Merge branch 'jk/maint-mv' into maint	2011-12-28 11:32:36 -08:00
name-rev.c
notes.c	Merge branch 'nd/war-on-nul-in-commit'	2011-12-22 11:27:26 -08:00
pack-objects.c
pack-redundant.c
pack-refs.c
patch-id.c
prune-packed.c
prune.c
push.c
read-tree.c
receive-pack.c
reflog.c
remote-ext.c
remote-fd.c
remote.c
replace.c
rerere.c
reset.c
rev-list.c
rev-parse.c
revert.c	Merge branch 'rr/revert-cherry-pick'	2011-12-22 15:30:22 -08:00
rm.c
send-pack.c
shortlog.c
show-branch.c
show-ref.c
stripspace.c
symbolic-ref.c
tag.c
tar-tree.c
unpack-file.c
unpack-objects.c
update-index.c
update-ref.c
update-server-info.c
upload-archive.c
var.c
verify-pack.c
verify-tag.c
write-tree.c