diff options
| author | Junio C Hamano <gitster@pobox.com> | 2026-01-23 13:34:37 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2026-01-23 13:34:37 -0800 |
| commit | a85b5220e186fc0e6b636e7ef02807b58264d05c (patch) | |
| tree | a641fbe75d179df32392e5ce44721eac607eac2f | |
| parent | 26f50ef98f78f3fb86cd4c94cd85fa09bf1221d0 (diff) | |
| parent | 46933bf1825eb436b8e3ae6aba067344e0a8bfae (diff) | |
| download | git-a85b5220e186fc0e6b636e7ef02807b58264d05c.tar.xz | |
Merge branch 'dk/replay-doc-omit-irrelevant-rev-list-options'
Documentation clean-up.
* dk/replay-doc-omit-irrelevant-rev-list-options:
lint-gitlink: preemptively ignore all /ifn?def|endif/ macros
replay: drop rev-list formatting options from manual
| -rw-r--r-- | Documentation/git-replay.adoc | 1 | ||||
| -rwxr-xr-x | Documentation/lint-gitlink.perl | 3 | ||||
| -rw-r--r-- | Documentation/rev-list-options.adoc | 4 |
3 files changed, 5 insertions, 3 deletions
diff --git a/Documentation/git-replay.adoc b/Documentation/git-replay.adoc index 4c61f3aa1f..c3b214ec69 100644 --- a/Documentation/git-replay.adoc +++ b/Documentation/git-replay.adoc @@ -64,6 +64,7 @@ The default mode can be configured via the `replay.refAction` configuration vari range should have a single tip, so that it's clear to which tip the advanced <branch> should point. +:git-replay: 1 include::rev-list-options.adoc[] [[output]] diff --git a/Documentation/lint-gitlink.perl b/Documentation/lint-gitlink.perl index f183a18df2..a92e887b4c 100755 --- a/Documentation/lint-gitlink.perl +++ b/Documentation/lint-gitlink.perl @@ -41,10 +41,11 @@ die "BUG: No list of valid linkgit:* files given" unless @ARGV; @ARGV = $to_check; while (<>) { my $line = $_; + next if $line =~ /^\s*(ifn?def|endif)::/; while ($line =~ m/(.{,8})((git[-a-z]+|scalar)\[(\d)*\])/g) { my $pos = pos $line; my ($macro, $target, $page, $section) = ($1, $2, $3, $4); - if ( $macro ne "linkgit:" && $macro !~ "ifn?def::" && $macro ne "endif::" ) { + if ( $macro ne "linkgit:" ) { report($pos, $line, $target, "linkgit: macro expected"); } } diff --git a/Documentation/rev-list-options.adoc b/Documentation/rev-list-options.adoc index 453ec59057..c4d7a6b989 100644 --- a/Documentation/rev-list-options.adoc +++ b/Documentation/rev-list-options.adoc @@ -1096,7 +1096,7 @@ endif::git-rev-list[] Overrides a previous `--no-walk`. endif::git-shortlog[] -ifndef::git-shortlog[] +ifndef::git-shortlog,git-replay[] Commit Formatting ~~~~~~~~~~~~~~~~~ @@ -1265,4 +1265,4 @@ ifdef::git-rev-list[] counts and print the count for equivalent commits separated by a tab. endif::git-rev-list[] -endif::git-shortlog[] +endif::git-shortlog,git-replay[] |