summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorShawn O. Pearce <spearce@spearce.org>2007-02-26 16:22:10 (GMT)
committerShawn O. Pearce <spearce@spearce.org>2007-02-26 16:22:10 (GMT)
commitfd234dfdb7ee1955922ded27ed18df59259193d9 (patch)
tree107b144e7807daeea119251ee47203d8067d0fbf
parent9b28a8b9c2051bf85f71cdec85c142a0ab561f10 (diff)
downloadgit-fd234dfdb7ee1955922ded27ed18df59259193d9.zip
git-fd234dfdb7ee1955922ded27ed18df59259193d9.tar.gz
git-fd234dfdb7ee1955922ded27ed18df59259193d9.tar.bz2
git-gui: Add Reset to the Branch menu.
cehteh on #git noticed that there was no way to perform a reset --hard from within git-gui. When I pointed out this was Merge->Abort Merge cehteh said this is not very understandable, and that most users would never guess to try that option unless they were actually in a merge. So Branch->Reset is now also a way to cause a reset --hard from within the UI. Right now the confirmation dialog is the same as the one used in Merge->Abort Merge. Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
-rwxr-xr-xgit-gui.sh6
1 files changed, 6 insertions, 0 deletions
diff --git a/git-gui.sh b/git-gui.sh
index 48097ea..36155bb 100755
--- a/git-gui.sh
+++ b/git-gui.sh
@@ -5256,6 +5256,12 @@ if {[is_enabled branch]} {
-font font_ui
lappend disable_on_lock [list .mbar.branch entryconf \
[.mbar.branch index last] -state]
+
+ .mbar.branch add command -label {Reset...} \
+ -command do_reset_hard \
+ -font font_ui
+ lappend disable_on_lock [list .mbar.branch entryconf \
+ [.mbar.branch index last] -state]
}
# -- Commit Menu