diff options
| author | Junio C Hamano <gitster@pobox.com> | 2025-12-22 14:57:48 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2025-12-22 14:57:48 +0900 |
| commit | 6a3051d3c200f0b40bf611338406af849de3d313 (patch) | |
| tree | aab066ab8ae001705e4490aa55ccfd7904ea05c0 | |
| parent | 5a8046ab33d383b758e7e283405697957e4691c0 (diff) | |
| parent | 9ba08b30a117e6925a9e5e87c92b37de7396d3a4 (diff) | |
| download | git-6a3051d3c200f0b40bf611338406af849de3d313.tar.xz | |
Merge branch 'kh/doc-replay-updates'
"git replay" documentation updates.
* kh/doc-replay-updates:
doc: replay: link section using markup
replay: improve --contained and add to doc
doc: replay: mention no output on conflicts
| -rw-r--r-- | Documentation/git-replay.adoc | 11 | ||||
| -rw-r--r-- | builtin/replay.c | 2 |
2 files changed, 11 insertions, 2 deletions
diff --git a/Documentation/git-replay.adoc b/Documentation/git-replay.adoc index d03235cca0..4c61f3aa1f 100644 --- a/Documentation/git-replay.adoc +++ b/Documentation/git-replay.adoc @@ -19,7 +19,7 @@ the working tree and the index untouched. By default, updates the relevant references using an atomic transaction (all refs update or none). Use `--ref-action=print` to avoid automatic ref updates and instead get update commands that can be piped to `git update-ref --stdin` -(see the OUTPUT section below). +(see the <<output,OUTPUT>> section below). THIS COMMAND IS EXPERIMENTAL. THE BEHAVIOR MAY CHANGE. @@ -42,6 +42,10 @@ The history is replayed on top of the <branch> and <branch> is updated to point at the tip of the resulting history. This is different from `--onto`, which uses the target only as a starting point without updating it. +--contained:: + Update all branches that point at commits in + <revision-range>. Requires `--onto`. + --ref-action[=<mode>]:: Control how references are updated. The mode can be: + @@ -62,6 +66,7 @@ The default mode can be configured via the `replay.refAction` configuration vari include::rev-list-options.adoc[] +[[output]] OUTPUT ------ @@ -80,6 +85,10 @@ the shape of the history being replayed. When using `--advance`, the number of refs updated is always one, but for `--onto`, it can be one or more (rebasing multiple branches simultaneously is supported). +There is no stderr output on conflicts; see the <<exit-status,EXIT +STATUS>> section below. + +[[exit-status]] EXIT STATUS ----------- diff --git a/builtin/replay.c b/builtin/replay.c index 507b909df7..c71f5e6d94 100644 --- a/builtin/replay.c +++ b/builtin/replay.c @@ -377,7 +377,7 @@ int cmd_replay(int argc, N_("revision"), N_("replay onto given commit")), OPT_BOOL(0, "contained", &contained, - N_("advance all branches contained in revision-range")), + N_("update all branches that point at commits in <revision-range>")), OPT_STRING(0, "ref-action", &ref_action, N_("mode"), N_("control ref update behavior (update|print)")), |