Skip to content

Commit a62a706

Browse files
stepnemgitster
authored andcommitted
git-jump: admit to passing merge mode args to ls-files
There's even an example of such usage in the README. Fixes: 67ba13e ("git-jump: pass "merge" arguments to ls-files") Signed-off-by: Štěpán Němec <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 043465a commit a62a706

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

contrib/git-jump/git-jump

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ The <mode> parameter is one of:
99
1010
diff: elements are diff hunks. Arguments are given to diff.
1111
12-
merge: elements are merge conflicts. Arguments are ignored.
12+
merge: elements are merge conflicts. Arguments are given to ls-files -u.
1313
1414
grep: elements are grep hits. Arguments are given to git grep or, if
1515
configured, to the command in `jump.grepCmd`.

0 commit comments

Comments
 (0)