[PATCHv2 3/3] format-patch: --numbered-files and --stdout aren't mutually exclusive
- From
Stephen Boyd <bebarino@gmail.com>
- Date
- Mar 22, 2009, 04:32 UTC
- Message-ID
- <1237696363-6819-4-git-send-email-bebarino@gmail.com>
- In-Reply-To
- <1237696363-6819-3-git-send-email-bebarino@gmail.com>
For example:
git format-patch --numbered-files --stdout --attach HEAD~~
will create two messages with files 1 and 2 attached respectively. There is no effect when using --numbered-files and --stdout together without an --attach or --inline, the files simply aren't created.
Signed-off-by: Stephen Boyd <bebarino@gmail.com> --- Documentation/git-format-patch.txt | 1 - builtin-log.c | 2 -- 2 files changed, 0 insertions(+), 3 deletions(-)
diff --git a/Documentation/git-format-patch.txt b/Documentation/git-format-patch.txt index c14e3ee..c2eb5fa 100644 --- a/Documentation/git-format-patch.txt +++ b/Documentation/git-format-patch.txt @@ -97,7 +97,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 8ea25e0..f81d3a3 100644 --- a/builtin-log.c +++ b/builtin-log.c @@ -951,8 +951,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)
-- 1.6.2