summaryrefslogtreecommitdiff
path: root/git-gui/lib/merge.tcl
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2007-05-10 22:08:18 (GMT)
committerJunio C Hamano <junkio@cox.net>2007-05-10 22:08:18 (GMT)
commit2b93bfac0f5bcabbf60f174f4e7bfa9e318e64d5 (patch)
tree5e5d3dcf64aa8cd7576e335d3f133deaf22539b5 /git-gui/lib/merge.tcl
parentffcc952b33575e28b971d63ba2b7e46b7726a257 (diff)
parentd6da71a9d16b8cf27f9d8f90692d3625c849cbc8 (diff)
downloadgit-2b93bfac0f5bcabbf60f174f4e7bfa9e318e64d5.zip
git-2b93bfac0f5bcabbf60f174f4e7bfa9e318e64d5.tar.gz
git-2b93bfac0f5bcabbf60f174f4e7bfa9e318e64d5.tar.bz2
Merge branch 'master' of git://repo.or.cz/git-gui
* 'master' of git://repo.or.cz/git-gui: git gui 0.7.0 git-gui: Paperbag fix blame in subdirectory git-gui: Format author/committer times in ISO format git-gui: Cleanup minor nits in blame code git-gui: Generate blame on uncommitted working tree file git-gui: Smarter command line parsing for browser, blame git-gui: Use prefix if blame is run in a subdirectory git-gui: Convert blame to the "class" way of doing things git-gui: Don't attempt to inline array reads in methods git-gui: Convert browser, console to "class" format git-gui: Define a simple class/method system git-gui: Allow shift-{k,j} to select a range of branches to merge git-gui: Call changes "Staged" and "Unstaged" in file list titles.
Diffstat (limited to 'git-gui/lib/merge.tcl')
-rw-r--r--git-gui/lib/merge.tcl5
1 files changed, 4 insertions, 1 deletions
diff --git a/git-gui/lib/merge.tcl b/git-gui/lib/merge.tcl
index 3dce856..24ed24b 100644
--- a/git-gui/lib/merge.tcl
+++ b/git-gui/lib/merge.tcl
@@ -123,7 +123,8 @@ Please select fewer branches. To merge more than 15 branches, merge the branche
set msg "Merging $current_branch, [join $names {, }]"
set ui_status_value "$msg..."
set cons [console::new "Merge" $msg]
- console::exec $cons $cmd [namespace code [list _finish $revcnt]]
+ console::exec $cons $cmd \
+ [namespace code [list _finish $revcnt $cons]]
bind $w <Destroy> {}
destroy $w
}
@@ -238,6 +239,8 @@ proc dialog {} {
$subj([lindex $ref 0])]
}
+ bind $w.source.l <Key-K> [list event generate %W <Shift-Key-Up>]
+ bind $w.source.l <Key-J> [list event generate %W <Shift-Key-Down>]
bind $w.source.l <Key-k> [list event generate %W <Key-Up>]
bind $w.source.l <Key-j> [list event generate %W <Key-Down>]
bind $w.source.l <Key-h> [list event generate %W <Key-Left>]