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 <bebarino@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Stephen Boyd committed
Mar 21, 2009 at 21:32 UTC
b60df87a6b39b3e9fc2fe81585a8bc55a502dcd3
2 files changed
-3
Documentation/git-format-patch.txt
-1
@@ -96,7 +96,6 @@ include::diff-options.txt[]
96
--numbered-files::
97
Output file names will be a simple number sequence
98
without the default first line of the commit appended.
99
- Mutually exclusive with the --stdout option.
99
100
-k::
101
--keep-subject::
builtin-log.c
-2
@@ -917,8 +917,6 @@ int cmd_format_patch(int argc, const char **argv, const char *prefix)
917
die ("-n and -k are mutually exclusive.");
918
if (keep_subject && subject_prefix)
919
die ("--subject-prefix and -k are mutually exclusive.");
920
- if (numbered_files && use_stdout)
921
- die ("--numbered-files and --stdout are mutually exclusive.");
920
921
argc = setup_revisions(argc, argv, &rev, "HEAD");
922
if (argc > 1)