diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-09-11 14:53:26 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-09-11 14:54:46 -0700 |
| commit | f14a310e8b665d0f1ac8cd91db3b101873a9bc5e (patch) | |
| tree | f7d29cb8a3c2e2dc065d524fe45cf8567334af6b /git-gui/lib | |
| parent | Prepare for 2.9.4 (diff) | |
| parent | git-gui: respect commit.gpgsign again (diff) | |
| download | git-f14a310e8b665d0f1ac8cd91db3b101873a9bc5e.tar.gz git-f14a310e8b665d0f1ac8cd91db3b101873a9bc5e.zip | |
Merge branch 'js/commit-gpgsign' of ../git-gui into js/git-gui-commit-gpgsign
* 'js/commit-gpgsign' of ../git-gui:
git-gui: respect commit.gpgsign again
Diffstat (limited to 'git-gui/lib')
| -rw-r--r-- | git-gui/lib/commit.tcl | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/git-gui/lib/commit.tcl b/git-gui/lib/commit.tcl index 864b687057..01d2cc280b 100644 --- a/git-gui/lib/commit.tcl +++ b/git-gui/lib/commit.tcl @@ -369,6 +369,9 @@ A rescan will be automatically started now. # -- Create the commit. # set cmd [list commit-tree $tree_id] + if {[is_config_true commit.gpgsign]} { + lappend cmd -S + } foreach p [concat $PARENT $MERGE_HEAD] { lappend cmd -p $p } |