diff options
| author | Junio C Hamano <junkio@cox.net> | 2005-10-03 22:28:45 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2005-10-04 17:04:44 -0700 |
| commit | c2d5036de5c2e21fb736002ae5b385ceb7c6b23b (patch) | |
| tree | 79850cb02b25c4045feddaefe408aed22a7101e5 /Documentation/git-apply.txt | |
| parent | 56d33b1105e63590577672de9afb920f6e7fd22c (diff) | |
| download | git-c2d5036de5c2e21fb736002ae5b385ceb7c6b23b.tar.gz git-c2d5036de5c2e21fb736002ae5b385ceb7c6b23b.tar.xz | |
git-apply: retire unused/unimplemented --no-merge flag.
The original plan was to do 3-way merge between local working tree,
index and the patch being applied, but that was never implemented.
Retire the flag to control its behaviour.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'Documentation/git-apply.txt')
| -rw-r--r-- | Documentation/git-apply.txt | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/Documentation/git-apply.txt b/Documentation/git-apply.txt index 4f7e1195d..cb676348f 100644 --- a/Documentation/git-apply.txt +++ b/Documentation/git-apply.txt @@ -9,7 +9,7 @@ git-apply - Apply patch on a GIT index file and a work tree SYNOPSIS -------- -'git-apply' [--no-merge] [--stat] [--summary] [--check] [--index] [--show-files] [--apply] [<patch>...] +'git-apply' [--stat] [--summary] [--check] [--index] [--show-files] [--apply] [<patch>...] DESCRIPTION ----------- @@ -22,11 +22,6 @@ OPTIONS The files to read patch from. '-' can be used to read from the standard input. ---no-merge:: - The default mode of operation is the merge behaviour - which is not implemented yet. This flag explicitly - tells the program not to use the merge behaviour. - --stat:: Instead of applying the patch, output diffstat for the input. Turns off "apply". |