diff options
| author | Junio C Hamano <gitster@pobox.com> | 2021-12-11 01:35:08 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-12-11 01:35:08 +0300 |
| commit | a0f3df5d64b146a52152ca9f41164b5353635a04 (patch) | |
| tree | 1b904649803cf7f8ded22944d549cad65b90f232 /contrib | |
| parent | a9c84980d0e55fa7802be4b02b12801ed7cd06d6 (diff) | |
| parent | 67ba13e5a4b27785391a0e1673d71e506edae13b (diff) | |
Merge branch 'jk/jump-merge-with-pathspec'
The "merge" subcommand of "git jump" (in contrib/) silently ignored
pathspec and other parameters.
* jk/jump-merge-with-pathspec:
git-jump: pass "merge" arguments to ls-files
Diffstat (limited to 'contrib')
| -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 |