aboutsummaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2008-07-01 16:22:39 -0700
committerJunio C Hamano <gitster@pobox.com>2008-07-01 16:22:39 -0700
commit27158e463a1be339ce34c7ee5fb553acaa7e28de (patch)
treea4ba9d0f81716dcb30e69677e09ef79c0878441d /Documentation
parentd4b76e15ea733002e364298a81889452b8bb2dfd (diff)
parentc14b9d1e330a7f68ffd0ad7e22d6148c6097c122 (diff)
downloadgit-27158e463a1be339ce34c7ee5fb553acaa7e28de.tar.gz
git-27158e463a1be339ce34c7ee5fb553acaa7e28de.tar.xz
Merge branch 'js/apply-recount'
* js/apply-recount: Allow git-apply to recount the lines in a hunk (AKA recountdiff)
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/git-apply.txt7
1 files changed, 6 insertions, 1 deletions
diff --git a/Documentation/git-apply.txt b/Documentation/git-apply.txt
index c8347637d..c5ee636fa 100644
--- a/Documentation/git-apply.txt
+++ b/Documentation/git-apply.txt
@@ -12,7 +12,7 @@ SYNOPSIS
'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
-------------