git-jump: pass "merge" arguments to ls-files
We currently throw away any arguments given to "git jump merge". We should instead pass them along to ls-files, since they're likely to be pathspecs. This matches the behavior of "git jump diff", etc. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Jeff King committed
Nov 9, 2021 at 11:35 UTC
67ba13e5a4b27785391a0e1673d71e506edae13b
2 files changed
+4
-1
contrib/git-jump/README
+3
@@ -65,6 +65,9 @@ git jump diff --cached
65
# jump to merge conflicts
66
git jump merge
67
68
+# documentation conflicts are hard; skip past them for now
69
+git jump merge :^Documentation
70
+
71
# jump to all instances of foo_bar
72
git jump grep foo_bar
73
contrib/git-jump/git-jump
+1
-1
@@ -39,7 +39,7 @@ mode_diff() {
39
}
40
41
mode_merge() {
42
- git ls-files -u |
42
+ git ls-files -u "$@" |
43
perl -pe 's/^.*?\t//' |
44
sort -u |
45
while IFS= read fn; do