X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=apply.c;h=a3474b788bca2b1dbbeba4c417a5489b4ae1c273;hb=12dd6e8cb0643231628d0240fdbb4afdef6629ea;hp=074684a99b8647e1c47a14e4eda744293b08e641;hpb=1b668341db6576d8d851473c74388031b319798a;p=git.git

diff --git a/apply.c b/apply.c
index 074684a9..a3474b78 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;