diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2020-01-06 14:17:50 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-01-06 14:17:50 -0800 |
| commit | c4117fcb97dbf5bc59d9cff09e7e4c0425fe8c27 (patch) | |
| tree | 82fe99fa9e69e4164a0a98f7259f5908dca9a4a2 | |
| parent | Merge branch 'ew/packfile-syscall-optim' (diff) | |
| parent | doc: log, gitk: line-log arguments must exist in starting revision (diff) | |
| download | tgif-c4117fcb97dbf5bc59d9cff09e7e4c0425fe8c27.tar.xz | |
Merge branch 'pb/clarify-line-log-doc'
Doc update.
* pb/clarify-line-log-doc:
doc: log, gitk: line-log arguments must exist in starting revision
doc: log, gitk: document accepted line-log diff formats
| -rw-r--r-- | Documentation/git-log.txt | 8 | ||||
| -rw-r--r-- | Documentation/gitk.txt | 8 |
2 files changed, 12 insertions, 4 deletions
diff --git a/Documentation/git-log.txt b/Documentation/git-log.txt index b406bc4c48..bed09bb09e 100644 --- a/Documentation/git-log.txt +++ b/Documentation/git-log.txt @@ -76,8 +76,12 @@ produced by `--stat`, etc. (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. + include::line-range-format.txt[] diff --git a/Documentation/gitk.txt b/Documentation/gitk.txt index 1eabb0aaf3..c653ebb6a8 100644 --- 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 |