summaryrefslogtreecommitdiff
path: root/git-gui.sh
diff options
context:
space:
mode:
authorShawn O. Pearce <spearce@spearce.org>2007-05-02 17:56:27 (GMT)
committerShawn O. Pearce <spearce@spearce.org>2007-05-08 03:35:51 (GMT)
commita6c9b081b6860816615e84b75bbc7916aab184e9 (patch)
treef14239d661fcc0ce25cc4cb44b621eb8cd5ba599 /git-gui.sh
parent60aa065f6958a888d14178ca94f17a60100d3709 (diff)
downloadgit-a6c9b081b6860816615e84b75bbc7916aab184e9.zip
git-a6c9b081b6860816615e84b75bbc7916aab184e9.tar.gz
git-a6c9b081b6860816615e84b75bbc7916aab184e9.tar.bz2
git-gui: Move merge support into a namespace
Like the console procs I have moved the code related to merge support into their own namespace, so that they are isolated from the rest of the world. Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Diffstat (limited to 'git-gui.sh')
-rwxr-xr-xgit-gui.sh6
1 files changed, 3 insertions, 3 deletions
diff --git a/git-gui.sh b/git-gui.sh
index dc6664c..4635825 100755
--- a/git-gui.sh
+++ b/git-gui.sh
@@ -1376,7 +1376,7 @@ if {[is_enabled branch]} {
[.mbar.branch index last] -state]
.mbar.branch add command -label {Reset...} \
- -command do_reset_hard
+ -command merge::reset_hard
lappend disable_on_lock [list .mbar.branch entryconf \
[.mbar.branch index last] -state]
}
@@ -1449,11 +1449,11 @@ if {[is_enabled multicommit] || [is_enabled singlecommit]} {
if {[is_enabled branch]} {
menu .mbar.merge
.mbar.merge add command -label {Local Merge...} \
- -command do_local_merge
+ -command merge::dialog
lappend disable_on_lock \
[list .mbar.merge entryconf [.mbar.merge index last] -state]
.mbar.merge add command -label {Abort Merge...} \
- -command do_reset_hard
+ -command merge::reset_hard
lappend disable_on_lock \
[list .mbar.merge entryconf [.mbar.merge index last] -state]