diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-01-17 23:06:53 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-01-17 23:06:53 -0800 |
| commit | 8f31355692f33944e9c1240de8b175c43f857de1 (patch) | |
| tree | 3d0ee0537996b6712a7b23beb0cbc6f5b9209eaf /Documentation | |
| parent | 90abc19b5ab53a49018a1beff0b3df260daa38e4 (diff) | |
| parent | 64912a67a43dec151906b93f96b07f16e17f71e9 (diff) | |
| download | git-8f31355692f33944e9c1240de8b175c43f857de1.tar.gz git-8f31355692f33944e9c1240de8b175c43f857de1.tar.xz | |
Merge branch 'mv/apply-parse-opt'
* mv/apply-parse-opt:
Resurrect "git apply --flags -" to read from the standard input
parse-opt: migrate builtin-apply.
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/git-apply.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/git-apply.txt b/Documentation/git-apply.txt index e726510ab..9400f6a5d 100644 --- a/Documentation/git-apply.txt +++ b/Documentation/git-apply.txt @@ -10,7 +10,7 @@ SYNOPSIS -------- [verse] 'git apply' [--stat] [--numstat] [--summary] [--check] [--index] - [--apply] [--no-add] [--build-fake-ancestor <file>] [-R | --reverse] + [--apply] [--no-add] [--build-fake-ancestor=<file>] [-R | --reverse] [--allow-binary-replacement | --binary] [--reject] [-z] [-pNUM] [-CNUM] [--inaccurate-eof] [--recount] [--cached] [--whitespace=<nowarn|warn|fix|error|error-all>] @@ -64,7 +64,7 @@ OPTIONS cached data, apply the patch, and store the result in the index, without using the working tree. This implies '--index'. ---build-fake-ancestor <file>:: +--build-fake-ancestor=<file>:: Newer 'git-diff' output has embedded 'index information' for each blob to help identify the original version that the patch applies to. When this flag is given, and if |