[PATCH 1/2] Documentation/git-log: document accepted line-log diff formats
- From
Philippe Blain via GitGitGadget <gitgitgadget@gmail.com>
- Date
- Dec 17, 2019, 05:07 UTC
- Message-ID
- <0ed04a8629a64d15062e13c1f1739b01436a897b.1576559263.git.gitgitgadget@gmail.com>
- In-Reply-To
- <pull.494.git.1576559263.gitgitgadget@gmail.com>
From: Philippe Blain <levraiphilippeblain@gmail.com>
Currently the line-log functionality (git log -L) only supports displaying patch output (`-p`, its default behavior) and suppressing it (`-s`). A check was added in the code to that effect in 5314efaea (line-log: detect unsupported formats, 2019-03-10) but the documentation was not updated.
Explicitly mention that `-L` implies `-p`, that patch output can be suppressed using `-s`, and that all other diff formats are not allowed.
Additionnally, mention that the ':<funcname>' form implies `--function-context`.
Signed-off-by: Philippe Blain <levraiphilippeblain@gmail.com> --- Documentation/git-log.txt | 6 +++++- Documentation/gitk.txt | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/Documentation/git-log.txt b/Documentation/git-log.txt index b406bc4c48..1c52bf184d 100644 --- a/Documentation/git-log.txt +++ b/Documentation/git-log.txt @@ -77,7 +77,11 @@ produced by `--stat`, etc. 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. + You can specify this option more than once. Implies `--patch`. + If ``:<funcname>'' is given, implies `--function-context`. + Patch output can be suppressed using `-s`, 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..91993b9d4c 100644 --- a/Documentation/gitk.txt +++ b/Documentation/gitk.txt @@ -106,7 +106,11 @@ linkgit:git-rev-list[1] for a complete list. 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. + You can specify this option more than once. Implies `--patch`. + If ``:<funcname>'' is given, implies `--function-context`. + Patch output can be suppressed using `-s`, 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
-- gitgitgadget