aboutsummaryrefslogtreecommitdiff
path: root/builtin/pull.c
diff options
context:
space:
mode:
authorPaul Tan <pyokagan@gmail.com>2015-08-04 21:51:53 +0800
committerJunio C Hamano <gitster@pobox.com>2015-08-04 22:02:11 -0700
commit7e35dacbe392f0d5faf3c75e8964ae96aa4636a7 (patch)
tree14c0f5160cf75db570fda0a52855ccb5b78987bd /builtin/pull.c
parent0cd4bcba679041274f9f5c381737f6f92b03b1b6 (diff)
downloadgit-7e35dacbe392f0d5faf3c75e8964ae96aa4636a7.tar.gz
git-7e35dacbe392f0d5faf3c75e8964ae96aa4636a7.tar.xz
builtin-am: implement -S/--gpg-sign, commit.gpgsign
Since 3b4e395 (am: add the --gpg-sign option, 2014-02-01), git-am.sh supported the --gpg-sign option, and would pass it to git-commit-tree, thus GPG-signing the commit object. Re-implement this option in builtin/am.c. git-commit-tree would also sign the commit by default if the commit.gpgsign setting is true. Since we do not run commit-tree, we re-implement this behavior by handling the commit.gpgsign setting ourselves. Helped-by: Stefan Beller <sbeller@google.com> Signed-off-by: Paul Tan <pyokagan@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/pull.c')
0 files changed, 0 insertions, 0 deletions