undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'jk/jump-merge-with-pathspec'

Browse Source 
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
This commit is contained in:
Junio C Hamano 2021-12-10 14:35:08 -08:00
commit a0f3df5d64
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
contrib/git-jump/README
View File

@ -65,6 +65,9 @@ git jump diff --cached
# jump to merge conflicts # jump to merge conflicts
git jump merge git jump merge
# documentation conflicts are hard; skip past them for now
git jump merge :^Documentation
# jump to all instances of foo_bar # jump to all instances of foo_bar
git jump grep foo_bar git jump grep foo_bar

2
contrib/git-jump/git-jump
View File

@ -39,7 +39,7 @@ mode_diff() {
} }
mode_merge() { mode_merge() {
git ls-files -u | git ls-files -u "$@" |
perl -pe 's/^.*?\t//' | perl -pe 's/^.*?\t//' |
sort -u | sort -u |
while IFS= read fn; do while IFS= read fn; do