X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=git-gui%2Flib%2Fmerge.tcl;h=460d32fa22fc77f6621e5ec9a9c6ba6dc98050c2;hb=476e42422d3a62a6aa301e41ba3def6882d37e9e;hp=5cded2341c541b5688adbac35d3d2e1216bc2d0b;hpb=a9eb30412942224c1494357f495b8b2a4b3d46b8;p=git.git diff --git a/git-gui/lib/merge.tcl b/git-gui/lib/merge.tcl index 5cded2341..460d32fa2 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