Merge branch 'dk/replay-doc-omit-irrelevant-rev-list-options' into seen

* dk/replay-doc-omit-irrelevant-rev-list-options:
  lint-gitlink: do not get confused by overly long ifdef directive
  replay: drop rev-list formatting options from manual

Author: gitster

Documentation/git-replay.adoc

@@ -66,6 +66,7 @@ The default mode can be configured via the `replay.refAction` configuration vari
 	changes are already present in the branch the commits are being
 	replayed onto will be dropped.
 
+:git-replay: 1
 include::rev-list-options.adoc[]
 
 [[output]]

Documentation/lint-gitlink.perl

@@ -41,7 +41,7 @@ sub report {
 @ARGV = $to_check;
 while (<>) {
 	my $line = $_;
-	while ($line =~ m/(.{,8})((git[-a-z]+|scalar)\[(\d)*\])/g) {
+	while ($line =~ m/([a-z]{,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::" ) {

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[]