Junio C Hamano 8fcbf006d8 Merge branch 'jc/signed-commit' into next ...

* jc/signed-commit:
  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

2011-12-21 13:15:04 -08:00

27 KiB

Raw Blame History

View Raw