diff options
| author | Junio C Hamano <junkio@cox.net> | 2005-07-13 20:28:55 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-13 20:53:33 -0700 |
| commit | 12dd6e8cb0643231628d0240fdbb4afdef6629ea (patch) | |
| tree | 217bb5ccab4a244247e4688fa4a229bba70466ed /Documentation | |
| parent | f28198e1367bd11eafbc18425f19c157d06a7e61 (diff) | |
| download | git-12dd6e8cb0643231628d0240fdbb4afdef6629ea.tar.gz git-12dd6e8cb0643231628d0240fdbb4afdef6629ea.tar.xz | |
[PATCH] apply: match documentation, usage string and code.
The more recent --apply option was not described.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/git-apply.txt | 28 |
1 files changed, 16 insertions, 12 deletions
diff --git a/Documentation/git-apply.txt b/Documentation/git-apply.txt index 81eb155af..391d6f5c2 100644 --- a/Documentation/git-apply.txt +++ b/Documentation/git-apply.txt @@ -9,8 +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] [-] [<file>...] +'git-apply' [--no-merge] [--stat] [--summary] [--check] [--index] [--show-files] [--apply] [<patch>...] DESCRIPTION ----------- @@ -19,31 +18,29 @@ and a work tree. OPTIONS ------- -<file>...:: - The files to read patch from. - --:: - Instead of reading from a file, read from standard input. +<patch>...:: + 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 quite implemented yet. This flag - explicitly tells the program not to use 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. + input. Turns off "apply". --summary:: Instead of applying the patch, output a condensed summary of information obtained from git diff extended headers, such as creations, renames and mode changes. + Turns off "apply". --check:: Instead of applying the patch, see if the patch is applicable to the current work tree and/or the index - file and detects errors. + file and detects errors. Turns off "apply". --index:: When --check is in effect, or when applying the patch @@ -57,6 +54,13 @@ OPTIONS --show-files:: Show summary of files that are affected by the patch. +--apply:: + If you use any of the options marked ``Turns off + "apply"'' above, git-apply reads and outputs the + information you asked without actually applying the + patch. Give this flag after those flags to also apply + the patch. + Author ------ |