From: Štěpán Němec Date: Thu, 05 Oct 2023 09:00:53 GMT Subject: [PATCH v2 3/5] git-jump: admit to passing merge mode args to ls-files Message-ID: <20231005090055.3097783-3-stepnem@smrk.net> In-Reply-To: <20231005090055.3097783-1-stepnem@smrk.net> 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 --- contrib/git-jump/git-jump | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/git-jump/git-jump b/contrib/git-jump/git-jump index 40c4b0d11107..47e0c557e63f 100755 --- a/contrib/git-jump/git-jump +++ b/contrib/git-jump/git-jump @@ -9,7 +9,7 @@ The 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`. -- 2.42.0