summaryrefslogtreecommitdiff
path: root/apply.c
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2005-07-14 03:28:55 (GMT)
committerLinus Torvalds <torvalds@g5.osdl.org>2005-07-14 03:53:33 (GMT)
commit12dd6e8cb0643231628d0240fdbb4afdef6629ea (patch)
tree217bb5ccab4a244247e4688fa4a229bba70466ed /apply.c
parentf28198e1367bd11eafbc18425f19c157d06a7e61 (diff)
downloadgit-12dd6e8cb0643231628d0240fdbb4afdef6629ea.zip
git-12dd6e8cb0643231628d0240fdbb4afdef6629ea.tar.gz
git-12dd6e8cb0643231628d0240fdbb4afdef6629ea.tar.bz2
[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.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/apply.c b/apply.c
index 074684a..a3474b7 100644
--- a/apply.c
+++ b/apply.c
@@ -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;