summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 9b28a8b)
raw | patch | inline | side by side (parent: 9b28a8b)
author | Shawn O. Pearce <spearce@spearce.org> | |
Mon, 26 Feb 2007 16:22:10 +0000 (11:22 -0500) | ||
committer | Shawn O. Pearce <spearce@spearce.org> | |
Mon, 26 Feb 2007 16:22:10 +0000 (11:22 -0500) |
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>
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>
git-gui.sh | patch | blob | history |
diff --git a/git-gui.sh b/git-gui.sh
index 48097ea5e868ca67566d5d6fc80248e8509915d4..36155bb8ea6e5049c313bb1406f4664a21894422 100755 (executable)
--- a/git-gui.sh
+++ b/git-gui.sh
-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