Skip to content

Commit b60df87

Browse files
bebarinogitster
authored andcommitted
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 <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 821d56a commit b60df87

File tree

2 files changed

+0
-3
lines changed

2 files changed

+0
-3
lines changed

Documentation/git-format-patch.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,6 @@ include::diff-options.txt[]
9696
--numbered-files::
9797
Output file names will be a simple number sequence
9898
without the default first line of the commit appended.
99-
Mutually exclusive with the --stdout option.
10099

101100
-k::
102101
--keep-subject::

builtin-log.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -917,8 +917,6 @@ int cmd_format_patch(int argc, const char **argv, const char *prefix)
917917
die ("-n and -k are mutually exclusive.");
918918
if (keep_subject && subject_prefix)
919919
die ("--subject-prefix and -k are mutually exclusive.");
920-
if (numbered_files && use_stdout)
921-
die ("--numbered-files and --stdout are mutually exclusive.");
922920

923921
argc = setup_revisions(argc, argv, &rev, "HEAD");
924922
if (argc > 1)

0 commit comments

Comments
 (0)