diff mbox series

[v11,1/2] doc: git-format-patch: describe the option --always

Message ID 3d7e96ce2b32096a6b900abe825b9df7b0ec3831.1637681215.git.gitgitgadget@gmail.com (mailing list archive)
State Accepted
Commit 552038e26cfa2a1b5a7843567ca7ab39a573951f
Headers show
Series am: support --empty=(die|drop|keep) option to handle empty patches | expand

Commit Message

徐沛文 (Aleen) Nov. 23, 2021, 3:26 p.m. UTC 
From: =?UTF-8?q?=E5=BE=90=E6=B2=9B=E6=96=87=20=28Aleen=29?=
 <aleen42@vip.qq.com>

This commit has described how to use '--always' option in the command
'git-format-patch' to include patches for commits that emit no changes.

Signed-off-by: 徐沛文 (Aleen) <aleen42@vip.qq.com>
---
 Documentation/git-format-patch.txt | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

Comments

Johannes Schindelin Nov. 23, 2021, 4:12 p.m. UTC | #1 
Hi,

On Tue, 23 Nov 2021, 徐沛文 (Aleen) via GitGitGadget wrote:

> From: =?UTF-8?q?=E5=BE=90=E6=B2=9B=E6=96=87=20=28Aleen=29?=
>  <aleen42@vip.qq.com>

I triggered the Azure Pipeline to submit this patch series after merging
the PR that fixed parsing of the `From:` line.

It looks a bit funny that this is in two lines, so I downloaded the mail
from https://lore.kernel.org/git/ and fed it to `git am`, which was just
fine with it.

Ciao,
Dscho
Junio C Hamano Nov. 23, 2021, 10:02 p.m. UTC | #2 
Johannes Schindelin <Johannes.Schindelin@gmx.de> writes:

> On Tue, 23 Nov 2021, 徐沛文 (Aleen) via GitGitGadget wrote:
>
>> From: =?UTF-8?q?=E5=BE=90=E6=B2=9B=E6=96=87=20=28Aleen=29?=
>>  <aleen42@vip.qq.com>
>
> I triggered the Azure Pipeline to submit this patch series after merging
> the PR that fixed parsing of the `From:` line.
>
> It looks a bit funny that this is in two lines, so I downloaded the mail
> from https://lore.kernel.org/git/ and fed it to `git am`, which was just
> fine with it.

;-)  Thanks for double-checking carefully.


These two are identical to what has been in my tree (as I
manually tweaked the patches from the previous rounds).

1:  6112004764 = 1:  e9181bd6fd doc: git-format-patch: describe the option --always
2:  b26f121395 = 2:  ca426b823b am: support --empty=<option> to handle empty patches

I'll pretend that I took v11 but please do not get alarmed if the
author and committer times are from v10.

Thanks, both.
diff mbox series

Patch

diff --git a/Documentation/git-format-patch.txt b/Documentation/git-format-patch.txt
index 113eabc107c..be797d7a28f 100644
--- a/Documentation/git-format-patch.txt
+++ b/Documentation/git-format-patch.txt
@@ -18,7 +18,7 @@  SYNOPSIS
 		   [-n | --numbered | -N | --no-numbered]
 		   [--start-number <n>] [--numbered-files]
 		   [--in-reply-to=<message id>] [--suffix=.<sfx>]
-		   [--ignore-if-in-upstream]
+		   [--ignore-if-in-upstream] [--always]
 		   [--cover-from-description=<mode>]
 		   [--rfc] [--subject-prefix=<subject prefix>]
 		   [(--reroll-count|-v) <n>]
@@ -192,6 +192,10 @@  will want to ensure that threading is disabled for `git send-email`.
 	patches being generated, and any patch that matches is
 	ignored.
 
+--always::
+	Include patches for commits that do not introduce any change,
+	which are omitted by default.
+
 --cover-from-description=<mode>::
 	Controls which parts of the cover letter will be automatically
 	populated using the branch's description.