diff options
| author | Miklos Vajna <vmiklos@frugalware.org> | 2008-12-27 23:03:57 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-12-30 08:03:48 (GMT) |
| commit | f26c4940c4c7942a95058d9aaef7b01967085a60 (patch) | |
| tree | 6eaa32badda00996f559d5fa5eb90ec3abd01714 /Documentation/git-apply.txt | |
| parent | c32f76f4d220e5d4d6a599d7a12a50b1e3ceceaf (diff) | |
| download | git-f26c4940c4c7942a95058d9aaef7b01967085a60.zip git-f26c4940c4c7942a95058d9aaef7b01967085a60.tar.gz git-f26c4940c4c7942a95058d9aaef7b01967085a60.tar.bz2 | |
parse-opt: migrate builtin-apply.
The only incompatible change is that the user how have to use '--'
before a patch file if it is named "--build-fake-ancestor=something".
Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-apply.txt')
| -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 e726510..9400f6a 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 |