diff options
| author |  Jonathan Nieder <jrnieder@gmail.com> | 2011-05-02 23:02:15 -0500 |
|---|---|---|
| committer | Jonathan Nieder <jrnieder@gmail.com> | 2011-05-02 23:02:15 -0500 |
| commit | 59445b0b02c731872c8665ac7e9cf1226fa616e4 (patch) | |
| tree | 93922cf13ed9c62859dac628fa7e376977a23d24 /git-gui/lib/merge.tcl | |
| parent | Revert "t0081 (line-buffer): add buffering tests" (diff) | |
| parent | Git 1.7.5 (diff) | |
| download | tgif-59445b0b02c731872c8665ac7e9cf1226fa616e4.tar.xz | |
Merge commit 'v1.7.5' into svn-fe
* commit 'v1.7.5': (436 commits)
Git 1.7.5
Git 1.7.5-rc3
Git 1.7.4.5
git-svn.txt: Document --mergeinfo
Revert "run-command: prettify -D_FORTIFY_SOURCE workaround"
...
Diffstat (limited to 'git-gui/lib/merge.tcl')
| -rw-r--r-- | git-gui/lib/merge.tcl | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/git-gui/lib/merge.tcl b/git-gui/lib/merge.tcl index 5cded2341c..460d32fa22 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 |