aboutsummaryrefslogtreecommitdiffstats
path: root/contrib/git-jump/git-jump
diff options
context:
space:
mode:
Diffstat (limited to 'contrib/git-jump/git-jump')
-rwxr-xr-xcontrib/git-jump/git-jump2
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`.