diff options
| author | John Baldwin <jhb@FreeBSD.org> | 2024-05-06 17:49:04 +0000 |
|---|---|---|
| committer | John Baldwin <jhb@FreeBSD.org> | 2024-05-06 17:49:04 +0000 |
| commit | 2f68f6474e4174999bcbab531b9b221c8671f544 (patch) | |
| tree | 6be7f0197691bded5ffb034f49cc316bba21bc9e /tools/tools/git/git-arc.1 | |
| parent | 3f0b80bc1537c257f3bd68592832ec8cb65e1c58 (diff) | |
| download | src-2f68f6474e4174999bcbab531b9b221c8671f544.tar.gz src-2f68f6474e4174999bcbab531b9b221c8671f544.zip | |
git-arc: Add list mode support for the update command
This can be particularly useful to do bulk-updates of multiple commits
using the same message, e.g.
git arc update -lm "Move function xyz to libfoo" main..myfeature
Similar to the list mode for the create command, git arc will list all
the candidate revisions with a single prompt. Once that is confirmed,
all the revisions are updated without showing the diffs or pausing
further prompts.
Reviewed by: markj
Differential Revision: https://reviews.freebsd.org/D45050
Diffstat (limited to 'tools/tools/git/git-arc.1')
| -rw-r--r-- | tools/tools/git/git-arc.1 | 19 |
1 files changed, 16 insertions, 3 deletions
diff --git a/tools/tools/git/git-arc.1 b/tools/tools/git/git-arc.1 index e449875c5043..5ada942d13a9 100644 --- a/tools/tools/git/git-arc.1 +++ b/tools/tools/git/git-arc.1 @@ -50,6 +50,7 @@ .Op Ar commit ... Ns | Ns Ar commit-range .Nm .Cm update +.Op Fl l .Op Fl m Ar message .Op Ar commit ... Ns | Ns Ar commit-range .Sh DESCRIPTION @@ -117,6 +118,11 @@ each revision. If an empty message is supplied via .Fl m , then no notes will be added when updating Differential Revisions. +.Pp +If +.Fl l +is used, display list of commits to be updated and wait for confirmation +of the list rather than prompting for each commit. .El .Sh CONFIGURATION These are manipulated by @@ -138,9 +144,9 @@ Defaults to false. Always use .Dq list mode .Pq Fl l -with create. -In this mode, the list of git revisions to create reviews for -is listed with a single prompt before creating reviews. +with create and update. +In this mode, the list of git revisions to use +is listed with a single prompt before creating or updating reviews. The diffs for individual commits are not shown. Defaults to false. .It Va arc.verbose @@ -227,6 +233,13 @@ List the status of reviews for all the commits in the branch .Bd -literal -offset indent $ git arc list main..feature .Ed +.Pp +Update reviews for all commits in the branch +.Dq feature +after rebasing: +.Bd -literal -offset indent +$ git arc update -lm "Rebase" main..feature +.Ed .Sh SEE ALSO .Xr build 7 , .Xr development 7 |