From: Stephen Boyd Date: Sun, 22 Mar 2009 04:32:43 +0000 (-0700) Subject: format-patch: --numbered-files and --stdout aren't mutually exclusive X-Git-Tag: v1.6.2.2~29 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=b60df87a6b39b3e9fc2fe81585a8bc55a502dcd3;p=git.git format-patch: --numbered-files and --stdout aren't mutually exclusive For example: git format-patch --numbered-files --stdout --attach HEAD~~ will create two messages with files 1 and 2 attached respectively. Without --attach/--inline but with --stdout, --numbered-files option can be simply ignored, because we are not creating any file ourselves. Signed-off-by: Stephen Boyd Signed-off-by: Junio C Hamano --- diff --git a/Documentation/git-format-patch.txt b/Documentation/git-format-patch.txt index 11a7d7726..dc40f4716 100644 --- a/Documentation/git-format-patch.txt +++ b/Documentation/git-format-patch.txt @@ -96,7 +96,6 @@ include::diff-options.txt[] --numbered-files:: Output file names will be a simple number sequence without the default first line of the commit appended. - Mutually exclusive with the --stdout option. -k:: --keep-subject:: diff --git a/builtin-log.c b/builtin-log.c index 2ae39afcc..0f0adf2ba 100644 --- a/builtin-log.c +++ b/builtin-log.c @@ -917,8 +917,6 @@ int cmd_format_patch(int argc, const char **argv, const char *prefix) die ("-n and -k are mutually exclusive."); if (keep_subject && subject_prefix) die ("--subject-prefix and -k are mutually exclusive."); - if (numbered_files && use_stdout) - die ("--numbered-files and --stdout are mutually exclusive."); argc = setup_revisions(argc, argv, &rev, "HEAD"); if (argc > 1)