summaryrefslogtreecommitdiff
path: root/man
diff options
context:
space:
mode:
authorKonstantin Ryabitsev <konstantin@linuxfoundation.org>2020-09-09 16:10:26 -0400
committerKonstantin Ryabitsev <konstantin@linuxfoundation.org>2020-09-09 16:10:26 -0400
commitace2273d92b52905662978b88faa74f368ce56ed (patch)
tree893259ff61f78ff8793adb8b148d998356c45ee0 /man
parent25bb755f319c6d9c45d316dd0777ebbbfa4a60d9 (diff)
downloadb4-ace2273d92b52905662978b88faa74f368ce56ed.tar.gz
Preserve trailer order by default
Per discussion on the users list, preserve the trailer order by default. There is no agreement on whether this is a hard requirement for patches or not, but there is general consensus that the default should be to make as few changes to incoming patches as possible. Signed-off-by: Konstantin Ryabitsev <konstantin@linuxfoundation.org>
Diffstat (limited to 'man')
-rw-r--r--man/b4.517
-rw-r--r--man/b4.5.rst9
2 files changed, 13 insertions, 13 deletions
diff --git a/man/b4.5 b/man/b4.5
index 95876b8..cdbd1d0 100644
--- a/man/b4.5
+++ b/man/b4.5
@@ -316,8 +316,6 @@ Save diff into this file instead of outputting to stdout
.B \-c\fP,\fB \-\-color
Force color output even when writing to file
.UNINDENT
-.IP "System Message: WARNING/2 (b4.5.rst:, line 201)"
-Option list ends without a blank line; unexpected unindent.
.INDENT 0.0
.TP
.B \-m AMBOX AMBOX, \-\-compare\-am\-mboxes AMBOX AMBOX
@@ -326,7 +324,7 @@ Compare two mbx files prepared with "b4 am"
.UNINDENT
.UNINDENT
.sp
-\fIExample\fP: b4 diff
+\fIExample\fP: b4 diff \fI\%20200526205322.23465\-1\-mic@digikod.net\fP
.SH CONFIGURATION
.sp
B4 configuration is handled via git\-config(1), so you can store it in
@@ -344,13 +342,14 @@ Default configuration, with explanations:
midmask = https://lore.kernel.org/r/%s\(aq
#
# When recording Link: trailers, use this mask
- linkmask = https://lore.kernel.org/r/%s\(aq
+ linkmask = https://lore.kernel.org/r/%s
#
- # When processing thread trailers, use this order. Can use shell\-globbing
- # and must end with ,*
- # Common alternative order:
+ # When processing thread trailers, sort them in this order.
+ # Can use shell\-globbing and must end with ,*
+ # Some sorting orders:
#trailer\-order=link*,fixes*,cc*,reported*,suggested*,original*,co\-*,tested*,reviewed*,acked*,signed\-off*,*
- trailer\-order = fixes*,reported*,suggested*,original*,co\-*,signed\-off*,tested*,reviewed*,acked*,cc*,link*,*
+ #trailer\-order = fixes*,reported*,suggested*,original*,co\-*,signed\-off*,tested*,reviewed*,acked*,cc*,link*,*
+ trailer\-order = _preserve_
#
# Attestation\-checking configuration parameters
# off: do not bother checking attestation
@@ -389,7 +388,7 @@ Default configuration, with explanations:
# How long to keep downloaded threads in cache (minutes)?
cache\-expire = 10
# Used when creating summaries for b4 ty, and can be set to a value like
- # thanks\-commit\-url\-mask = https://git.kernel.org/username/c/%.10s
+ # thanks\-commit\-url\-mask = https://git.kernel.org/username/c/%.12s
# See this page for more info on convenient git.kernel.org shorterners:
# https://korg.wiki.kernel.org/userdoc/git\-url\-shorterners
thanks\-commit\-url\-mask = None
diff --git a/man/b4.5.rst b/man/b4.5.rst
index 2591a04..9e0d995 100644
--- a/man/b4.5.rst
+++ b/man/b4.5.rst
@@ -219,11 +219,12 @@ Default configuration, with explanations::
# When recording Link: trailers, use this mask
linkmask = https://lore.kernel.org/r/%s
#
- # When processing thread trailers, use this order. Can use shell-globbing
- # and must end with ,*
- # Common alternative order:
+ # When processing thread trailers, sort them in this order.
+ # Can use shell-globbing and must end with ,*
+ # Some sorting orders:
#trailer-order=link*,fixes*,cc*,reported*,suggested*,original*,co-*,tested*,reviewed*,acked*,signed-off*,*
- trailer-order = fixes*,reported*,suggested*,original*,co-*,signed-off*,tested*,reviewed*,acked*,cc*,link*,*
+ #trailer-order = fixes*,reported*,suggested*,original*,co-*,signed-off*,tested*,reviewed*,acked*,cc*,link*,*
+ trailer-order = _preserve_
#
# Attestation-checking configuration parameters
# off: do not bother checking attestation