merge script: --squash, --ff from unborn branch are errors

diff --git a/Documentation/git-log.txt b/Documentation/git-log.txt
index c925d3675af78e0bce7840a8fef28567d72e4695..e970664fe1a47c3f35f0f7c60b6c8f9781caed31 100644 (file)
--- a/Documentation/git-log.txt
+++ b/Documentation/git-log.txt
@@ -31,8 +31,7 @@ OPTIONS
        either <since> or <until> is omitted, it defaults to
        `HEAD`, i.e. the tip of the current branch.
        For a more complete list of ways to spell <since>
-       and <until>, see "SPECIFYING REVISIONS" section in
-       linkgit:git-rev-parse[1].
+       and <until>, see linkgit:gitrevisions[1].
 
 --follow::
        Continue listing the history of a file beyond renames