]> git.ipfire.org Git - thirdparty/git.git/blobdiff - Documentation/git-apply.txt
Documentation: be consistent about "git-" versus "git "
[thirdparty/git.git] / Documentation / git-apply.txt
index c8347637da55e32ec4c637280d7027dc8883c264..138f735fd3d9d21a1f10fa014853e545cb07c03b 100644 (file)
@@ -9,10 +9,10 @@ git-apply - Apply a patch on a git index file and a working tree
 SYNOPSIS
 --------
 [verse]
-'git-apply' [--stat] [--numstat] [--summary] [--check] [--index]
+'git apply' [--stat] [--numstat] [--summary] [--check] [--index]
          [--apply] [--no-add] [--build-fake-ancestor <file>] [-R | --reverse]
          [--allow-binary-replacement | --binary] [--reject] [-z]
-         [-pNUM] [-CNUM] [--inaccurate-eof] [--cached]
+         [-pNUM] [-CNUM] [--inaccurate-eof] [--recount] [--cached]
          [--whitespace=<nowarn|warn|fix|error|error-all>]
          [--exclude=PATH] [--verbose] [<patch>...]
 
@@ -177,6 +177,11 @@ behavior:
        current patch being applied will be printed. This option will cause
        additional information to be reported.
 
+--recount::
+       Do not trust the line counts in the hunk headers, but infer them
+       by inspecting the patch (e.g. after editing the patch without
+       adjusting the hunk headers appropriately).
+
 Configuration
 -------------