summaryrefslogtreecommitdiff
path: root/git-gui/lib/merge.tcl
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-03-26 17:42:26 (GMT)
committerJunio C Hamano <gitster@pobox.com>2011-03-26 17:42:35 (GMT)
commit42f98745732c68baa6d79a50eab0d726b549025d (patch)
tree1faa87249a8800a909bed0d34a22f13207bb3ad5 /git-gui/lib/merge.tcl
parent421446b6fcf2c3767e7e714388163b29a65f45cc (diff)
parentfbc9629e2f0cd31ab08638ebbd8f98a323329a5b (diff)
downloadgit-42f98745732c68baa6d79a50eab0d726b549025d.zip
git-42f98745732c68baa6d79a50eab0d726b549025d.tar.gz
git-42f98745732c68baa6d79a50eab0d726b549025d.tar.bz2
Merge git-gui 0.14.0
Diffstat (limited to 'git-gui/lib/merge.tcl')
-rw-r--r--git-gui/lib/merge.tcl2
1 files changed, 2 insertions, 0 deletions
diff --git a/git-gui/lib/merge.tcl b/git-gui/lib/merge.tcl
index 5cded23..460d32f 100644
--- a/git-gui/lib/merge.tcl
+++ b/git-gui/lib/merge.tcl
@@ -83,6 +83,7 @@ method _visualize {} {
method _start {} {
global HEAD current_branch remote_url
+ global _last_merged_branch
set name [_rev $this]
if {$name eq {}} {
@@ -109,6 +110,7 @@ method _start {} {
regsub ^refs/heads/ $branch {} branch
puts $fh "$cmit\t\tbranch '$branch' of $remote"
close $fh
+ set _last_merged_branch $branch
set cmd [list git]
lappend cmd merge