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 /apply.c | |
| 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 'apply.c')
| -rw-r--r-- | apply.c | 4 |
1 files changed, 3 insertions, 1 deletions
@@ -32,7 +32,8 @@ static int summary = 0; static int check = 0; static int apply = 1; static int show_files = 0; -static const char apply_usage[] = "git-apply [--stat] [--summary] [--check] [--show-files] <patch>"; +static const char apply_usage[] = +"git-apply [--no-merge] [--stat] [--summary] [--check] [--index] [--apply] [--show-files] <patch>..."; /* * For "diff-stat" like behaviour, we keep track of the biggest change @@ -1424,6 +1425,7 @@ int main(int argc, char **argv) read_stdin = 0; continue; } + /* NEEDSWORK: this does not do anything at this moment. */ if (!strcmp(arg, "--no-merge")) { merge_patch = 0; continue; |