aboutsummaryrefslogtreecommitdiff
path: root/man/b4.5.rst
diff options
context:
space:
mode:
Diffstat (limited to 'man/b4.5.rst')
-rw-r--r--man/b4.5.rst45
1 files changed, 41 insertions, 4 deletions
diff --git a/man/b4.5.rst b/man/b4.5.rst
index c95b172..d8e28f6 100644
--- a/man/b4.5.rst
+++ b/man/b4.5.rst
@@ -5,15 +5,15 @@ Work with code submissions in a public-inbox archive
----------------------------------------------------
:Author: mricon@kernel.org
-:Date: 2020-04-10
+:Date: 2020-05-25
:Copyright: The Linux Foundation and contributors
:License: GPLv2+
-:Version: 0.4.1
+:Version: 0.5.0
:Manual section: 5
SYNOPSIS
--------
-b4 {mbox,am,attest,pr,ty} [options]
+b4 {mbox,am,attest,pr,ty,diff} [options]
DESCRIPTION
-----------
@@ -32,6 +32,7 @@ SUBCOMMANDS
* *b4 attest*: (EXPERIMENTAL) Submit cryptographic attestation for patches
* *b4 pr*: (EXPERIMENTAL) Work with pull requests
* *b4 ty*: (EXPERIMENTAL) Create templated replies for processed patches and pull requests
+* *b4 diff*: (EXPERIMENTAL) Show range-diff style diffs between patch versions
OPTIONS
-------
@@ -105,7 +106,11 @@ optional arguments:
Cherry-pick a subset of patches (e.g. "-P 1-2,4,6-",
"-P _" to use just the msgid specified,
or "-P \*globbing\*" to match on commit subject)
+ -g, --guess-base
+ Try to guess the base of the series (if not specified)
+ -3, --prep-3way
+ Prepare for a 3-way merge (tries to ensure that all
+ index blobs exist by making a fake commit range)
*Example*: b4 am 20200313231252.64999-1-keescook@chromium.org
@@ -173,6 +178,38 @@ optional arguments:
*Example*: b4 ty --auto
+b4 diff
+~~~~~~~
+usage: b4 diff [-h] [-g GITDIR] [-p USEPROJECT] [-C] [-v WANTVERS [WANTVERS ...]] [-n] [-o OUTDIFF] [-c] [-m AMBOX AMBOX] [msgid]
+
+positional arguments:
+ msgid Message ID to process, pipe a raw message, or use -m
+
+optional arguments:
+
+ -h, --help show this help message and exit
+ -g GITDIR, --gitdir GITDIR
+ Operate on this git tree instead of current dir
+ -p USEPROJECT, --use-project USEPROJECT
+ Use a specific project instead of guessing (linux-mm, linux-hardening, etc)
+ -C, --no-cache Do not use local cache
+
+ -v WANTVERS [WANTVERS ...], --compare-versions WANTVERS [WANTVERS ...]
+ Compare specific versions instead of latest and one before that, e.g. -v 3 5
+
+ -n, --no-diff
+ Do not generate a diff, just show the command to do it
+
+ -o OUTDIFF, --output-diff OUTDIFF
+ Save diff into this file instead of outputting to stdout
+ -c, --color
+ Force color output even when writing to file
+
+ -m AMBOX AMBOX, --compare-am-mboxes AMBOX AMBOX
+ Compare two mbx files prepared with "b4 am"
+
+*Example*: b4 diff
+
CONFIGURATION
-------------
B4 configuration is handled via git-config(1), so you can store it in