X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=Documentation%2Fgit-merge.txt;h=0f79665ea6e6bf1ffd4ff67f7aee2fcbddec0555;hb=ae41098714898acd52dba291e476a2fedbd2eae2;hp=e2954aa76eef46101f38683eb346bd31bf711a40;hpb=ba988a83f0cfdafdcfdc7ed44253840ea83578fb;p=git.git

diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt
index e2954aa76..0f79665ea 100644
--- a/Documentation/git-merge.txt
+++ b/Documentation/git-merge.txt
@@ -10,7 +10,6 @@ SYNOPSIS
 --------
 [verse]
 'git-merge' [-n] [--no-commit] [--squash] [-s <strategy>]...
-	[--reflog-action=<action>]
 	-m=<msg> <remote> <remote>...
 
 DESCRIPTION
@@ -37,11 +36,6 @@ include::merge-options.txt[]
 	least one <remote>.  Specifying more than one <remote>
 	obviously means you are trying an Octopus.
 
---reflog-action=<action>::
-	This is used internally when `git-pull` calls this command
-	to record that the merge was created by `pull` command
-	in the `ref-log` entry that results from the merge.
-
 include::merge-strategies.txt[]