From f26c4940c4c7942a95058d9aaef7b01967085a60 Mon Sep 17 00:00:00 2001 From: Miklos Vajna Date: Sun, 28 Dec 2008 00:03:57 +0100 Subject: 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 Signed-off-by: Junio C Hamano --- Documentation/git-apply.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Documentation/git-apply.txt') 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 ] [-R | --reverse] + [--apply] [--no-add] [--build-fake-ancestor=] [-R | --reverse] [--allow-binary-replacement | --binary] [--reject] [-z] [-pNUM] [-CNUM] [--inaccurate-eof] [--recount] [--cached] [--whitespace=] @@ -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 :: +--build-fake-ancestor=:: 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 -- cgit v1.2.1