aboutsummaryrefslogtreecommitdiff
path: root/git-gui/lib/sshkey.tcl
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-02-09 13:30:52 -0800
committerJunio C Hamano <gitster@pobox.com>2012-02-09 13:30:52 -0800
commit3adab6f3a7793253b22a4a7aae34221d19e0236a (patch)
tree63edce038f0aa2a5256edb8a23810f562443f5e8 /git-gui/lib/sshkey.tcl
parentb5c9f1c1b0ed9c91463b9f46a7c9dff3efc53773 (diff)
downloadgit-3adab6f3a7793253b22a4a7aae34221d19e0236a.tar.gz
git-3adab6f3a7793253b22a4a7aae34221d19e0236a.tar.xz
merge: do not launch an editor on "--no-edit $tag"
When the user explicitly asked us not to, don't launch an editor. But do everything else the same way as the "edit" case, i.e. leave the comment with verification result in the log template and record the mergesig in the resulting merge commit for later inspection. Based on initiail analysis by Jonathan Nieder. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-gui/lib/sshkey.tcl')
0 files changed, 0 insertions, 0 deletions