diff options
| author | Jeff King <peff@peff.net> | 2021-11-09 11:35:47 -0500 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-11-09 11:15:21 -0800 |
| commit | 67ba13e5a4b27785391a0e1673d71e506edae13b (patch) | |
| tree | e8ef0c9ed44b7221d81f55178ffc8776e8207505 /contrib/git-jump | |
| parent | 88d915a634b449147855041d44875322de2b286d (diff) | |
| download | git-67ba13e5a4b27785391a0e1673d71e506edae13b.tar.gz | |
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>
Diffstat (limited to 'contrib/git-jump')
| -rw-r--r-- | contrib/git-jump/README | 3 | ||||
| -rwxr-xr-x | contrib/git-jump/git-jump | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/contrib/git-jump/README b/contrib/git-jump/README index 2f618a7f97..8bcace29d2 100644 --- a/contrib/git-jump/README +++ b/contrib/git-jump/README @@ -65,6 +65,9 @@ git jump diff --cached # jump to merge conflicts git jump merge +# documentation conflicts are hard; skip past them for now +git jump merge :^Documentation + # jump to all instances of foo_bar git jump grep foo_bar diff --git a/contrib/git-jump/git-jump b/contrib/git-jump/git-jump index 931b0fe3a9..92dbd4cde1 100755 --- a/contrib/git-jump/git-jump +++ b/contrib/git-jump/git-jump @@ -39,7 +39,7 @@ mode_diff() { } mode_merge() { - git ls-files -u | + git ls-files -u "$@" | perl -pe 's/^.*?\t//' | sort -u | while IFS= read fn; do |