Merge branch 'vs/complete-stash-show-p-fix'

[thirdparty/git.git] / Documentation / gitk.txt

diff --git a/Documentation/gitk.txt b/Documentation/gitk.txt
index 1eabb0aaf3aec94f7551b259efff7ba317ce610e..c653ebb6a80c03bab1e593f13b488d742ff5cbce 100644 (file)
--- a/Documentation/gitk.txt
+++ b/Documentation/gitk.txt
@@ -105,8 +105,12 @@ linkgit:git-rev-list[1] for a complete list.
        (or the function name regex <funcname>) within the <file>.  You may
        not give any pathspec limiters.  This is currently limited to
        a walk starting from a single revision, i.e., you may only
-       give zero or one positive revision arguments.
-       You can specify this option more than once.
+       give zero or one positive revision arguments, and
+       <start> and <end> (or <funcname>) must exist in the starting revision.
+       You can specify this option more than once. Implies `--patch`.
+       Patch output can be suppressed using `--no-patch`, but other diff formats
+       (namely `--raw`, `--numstat`, `--shortstat`, `--dirstat`, `--summary`,
+       `--name-only`, `--name-status`, `--check`) are not currently implemented.
 +
 *Note:* gitk (unlike linkgit:git-log[1]) currently only understands
 this option if you specify it "glued together" with its argument.  Do