aboutsummaryrefslogtreecommitdiffstats
path: root/git-gui/lib/remote_branch_delete.tcl
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-03-26 10:42:26 -0700
committerJunio C Hamano <gitster@pobox.com>2011-03-26 10:42:35 -0700
commit42f98745732c68baa6d79a50eab0d726b549025d (patch)
tree1faa87249a8800a909bed0d34a22f13207bb3ad5 /git-gui/lib/remote_branch_delete.tcl
parent421446b6fcf2c3767e7e714388163b29a65f45cc (diff)
parentfbc9629e2f0cd31ab08638ebbd8f98a323329a5b (diff)
downloadgit-42f98745732c68baa6d79a50eab0d726b549025d.tar.gz
Merge git-gui 0.14.0
Diffstat (limited to 'git-gui/lib/remote_branch_delete.tcl')
-rw-r--r--git-gui/lib/remote_branch_delete.tcl9
1 files changed, 8 insertions, 1 deletions
diff --git a/git-gui/lib/remote_branch_delete.tcl b/git-gui/lib/remote_branch_delete.tcl
index f872a3d89d..fcc06d03a1 100644
--- a/git-gui/lib/remote_branch_delete.tcl
+++ b/git-gui/lib/remote_branch_delete.tcl
@@ -251,7 +251,7 @@ method _write_url {args} { set urltype url }
method _write_check_head {args} { set checktype head }
method _write_head_list {args} {
- global current_branch
+ global current_branch _last_merged_branch
$head_m delete 0 end
foreach abr $head_list {
@@ -267,6 +267,13 @@ method _write_head_list {args} {
set check_head $current_branch
}
}
+ set lmb [lsearch -exact -sorted $head_list $_last_merged_branch]
+ if {$lmb >= 0} {
+ $w.heads.l conf -state normal
+ $w.heads.l select set $lmb
+ $w.heads.l yview $lmb
+ $w.heads.l conf -state disabled
+ }
}
method _write_urltype {args} {