X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=Documentation%2Fgit-apply.txt;h=cb676348f87840d722450d9efbf2d4c112fdf10a;hb=c2d5036de5c2e21fb736002ae5b385ceb7c6b23b;hp=4f7e1195dee9993974d8f671d750498e66ede984;hpb=56d33b1105e63590577672de9afb920f6e7fd22c;p=git.git

diff --git a/Documentation/git-apply.txt b/Documentation/git-apply.txt
index 4f7e1195..cb676348 100644
--- a/Documentation/git-apply.txt
+++ b/Documentation/git-apply.txt
@@ -9,7 +9,7 @@ git-apply - Apply patch on a GIT index file and a work tree
 
 SYNOPSIS
 --------
-'git-apply' [--no-merge] [--stat] [--summary] [--check] [--index] [--show-files] [--apply] [<patch>...]
+'git-apply' [--stat] [--summary] [--check] [--index] [--show-files] [--apply] [<patch>...]
 
 DESCRIPTION
 -----------
@@ -22,11 +22,6 @@ OPTIONS
 	The files to read patch from.  '-' can be used to read
 	from the standard input.
 
---no-merge::
-	The default mode of operation is the merge behaviour
-	which is not implemented yet.  This flag explicitly
-	tells the program not to use the merge behaviour.
-
 --stat::
 	Instead of applying the patch, output diffstat for the
 	input.  Turns off "apply".