summaryrefslogtreecommitdiff
path: root/gitk
diff options
context:
space:
mode:
authorMartin Langhoff <martin@laptop.org>2012-06-14 18:34:11 (GMT)
committerPaul Mackerras <paulus@samba.org>2013-05-13 11:29:40 (GMT)
commitc33cb9083ecad2ec7e23b00722096a94e62b17e1 (patch)
treefc2099824e1ae3364847651dc32f00d7305e27ad /gitk
parent8f3ff9339fd0bdb797e072a1843bc5e9f766e4c6 (diff)
downloadgit-c33cb9083ecad2ec7e23b00722096a94e62b17e1.zip
git-c33cb9083ecad2ec7e23b00722096a94e62b17e1.tar.gz
git-c33cb9083ecad2ec7e23b00722096a94e62b17e1.tar.bz2
gitk: Add support for -G'regex' pickaxe variant
git log -G'regex' is a very useful alternative to the classic pickaxe. Minimal patch to make it usable from gitk. [zj: reword message] [paulus@samba.org: reword droplist item] Signed-off-by: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'gitk')
-rwxr-xr-xgitk5
1 files changed, 4 insertions, 1 deletions
diff --git a/gitk b/gitk
index 9284c19..22a05b0 100755
--- a/gitk
+++ b/gitk
@@ -2253,7 +2253,8 @@ proc makewindow {} {
set gm [makedroplist .tf.lbar.gdttype gdttype \
[mc "containing:"] \
[mc "touching paths:"] \
- [mc "adding/removing string:"]]
+ [mc "adding/removing string:"] \
+ [mc "changing lines matching:"]]
trace add variable gdttype write gdttype_change
pack .tf.lbar.gdttype -side left -fill y
@@ -4658,6 +4659,8 @@ proc do_file_hl {serial} {
set gdtargs [concat -- $relative_paths]
} elseif {$gdttype eq [mc "adding/removing string:"]} {
set gdtargs [list "-S$highlight_files"]
+ } elseif {$gdttype eq [mc "changing lines matching:"]} {
+ set gdtargs [list "-G$highlight_files"]
} else {
# must be "containing:", i.e. we're searching commit info
return