diff options
author | Stephen Boyd <bebarino@gmail.com> | 2009-03-21 21:32:43 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2009-03-21 22:45:28 -0700 |
commit | b60df87a6b39b3e9fc2fe81585a8bc55a502dcd3 (patch) | |
tree | 27365151b9bd842b851524f7d3f7698a74c89f26 /Documentation | |
parent | doc: clarify how -S works (diff) | |
download | tgif-b60df87a6b39b3e9fc2fe81585a8bc55a502dcd3.tar.xz |
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>
Diffstat (limited to 'Documentation')
-rw-r--r-- | Documentation/git-format-patch.txt | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/Documentation/git-format-patch.txt b/Documentation/git-format-patch.txt index 11a7d77261..dc40f47169 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:: |