aboutsummaryrefslogtreecommitdiff
path: root/git-gui.sh
diff options
context:
space:
mode:
authorHeiko Voigt <hvoigt@hvoigt.net>2011-02-12 17:44:58 +0100
committerPat Thoyts <patthoyts@users.sourceforge.net>2011-02-13 00:47:24 +0000
commit9d04278a4d0fcd784e7b9998caa94cff6cbdca8a (patch)
tree938dcfee522603ddc900db0d74ccbe501dd0468c /git-gui.sh
parent8b92658206c3fb7d23fdacd626667985bf4c50b4 (diff)
downloadgit-9d04278a4d0fcd784e7b9998caa94cff6cbdca8a.tar.gz
git-9d04278a4d0fcd784e7b9998caa94cff6cbdca8a.tar.xz
git-gui: always default to the last merged branch in remote delete
This is useful if you are directly working together with other developers pushing feature branches on a shared remote. You typically push feature branches to the remote so others can review. Once they are satisfied and the branch is merged into the main branch it needs to be deleted on the server. Since we did not yet have a preselected default branch in the remote delete dialog lets use the last merged branch if it is found on the server. Signed-off-by: Heiko Voigt <hvoigt@hvoigt.net> Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
Diffstat (limited to 'git-gui.sh')
-rwxr-xr-xgit-gui.sh4
1 files changed, 4 insertions, 0 deletions
diff --git a/git-gui.sh b/git-gui.sh
index 886719a8c..d96df63ab 100755
--- a/git-gui.sh
+++ b/git-gui.sh
@@ -139,6 +139,10 @@ if {$_trace >= 0} {
set _trace 0
}
+# variable for the last merged branch (useful for a default when deleting
+# branches).
+set _last_merged_branch {}
+
proc shellpath {} {
global _shellpath env
if {[string match @@* $_shellpath]} {