diff options
| author | Štěpán Němec <stepnem@smrk.net> | 2023-10-05 12:00:53 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-10-05 22:55:38 +0300 |
| commit | a62a7060a50e09089fb63b793b97c4b570993142 (patch) | |
| tree | 60e64517ed643f92e573e96e16a251f06fb0acf7 /contrib | |
| parent | 043465a6cf251202171b70b304b02dc306eff5f8 (diff) | |
git-jump: admit to passing merge mode args to ls-files
There's even an example of such usage in the README.
Fixes: 67ba13e5a4b2 ("git-jump: pass "merge" arguments to ls-files")
Signed-off-by: Štěpán Němec <stepnem@smrk.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'contrib')
| -rwxr-xr-x | contrib/git-jump/git-jump | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/git-jump/git-jump b/contrib/git-jump/git-jump index 40c4b0d111..47e0c557e6 100755 --- a/contrib/git-jump/git-jump +++ b/contrib/git-jump/git-jump @@ -9,7 +9,7 @@ The <mode> parameter is one of: diff: elements are diff hunks. Arguments are given to diff. -merge: elements are merge conflicts. Arguments are ignored. +merge: elements are merge conflicts. Arguments are given to ls-files -u. grep: elements are grep hits. Arguments are given to git grep or, if configured, to the command in `jump.grepCmd`. |