From 12dd6e8cb0643231628d0240fdbb4afdef6629ea Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Wed, 13 Jul 2005 20:28:55 -0700 Subject: [PATCH] apply: match documentation, usage string and code. The more recent --apply option was not described. Signed-off-by: Junio C Hamano Signed-off-by: Linus Torvalds --- apply.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'apply.c') diff --git a/apply.c b/apply.c index 074684a99..a3474b788 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] "; +static const char apply_usage[] = +"git-apply [--no-merge] [--stat] [--summary] [--check] [--index] [--apply] [--show-files] ..."; /* * 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; -- cgit v1.2.1