diff options
| author |  brian m. carlson <sandals@crustytoothpaste.net> | 2014-02-10 01:03:38 +0000 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2014-02-11 14:52:08 -0800 |
| commit | ea230d8b626d48a5b7851d84f75dd6708479cb59 (patch) | |
| tree | 9f2072b90698d35027a07cd114b731eb3f32bd0d /builtin/merge.c | |
| parent | rebase: add the --gpg-sign option (diff) | |
| download | tgif-ea230d8b626d48a5b7851d84f75dd6708479cb59.tar.xz | |
pull: add the --gpg-sign option.
git merge already allows us to sign commits, and git rebase has recently
learned how to do so as well. Teach git pull to parse the -S/--gpg-sign
option and pass this along to merge or rebase, as appropriate.
Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/merge.c')
0 files changed, 0 insertions, 0 deletions