Skip to content

Commit bbefa15

Browse files
committed
Merge branch 'en/replay-doc-revision-range'
The use of "revision" (a connected set of commits) has been clarified in the "git replay" documentation. * en/replay-doc-revision-range: Documentation/git-replay.adoc: fix errors around revision range
2 parents 7fc0b33 + 136f86a commit bbefa15

2 files changed

Lines changed: 7 additions & 8 deletions

File tree

Documentation/git-replay.adoc

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@ git-replay - EXPERIMENTAL: Replay commits on a new base, works with bare repos t
99
SYNOPSIS
1010
--------
1111
[verse]
12-
(EXPERIMENTAL!) 'git replay' ([--contained] --onto <newbase> | --advance <branch>) [--ref-action[=<mode>]] <revision-range>...
12+
(EXPERIMENTAL!) 'git replay' ([--contained] --onto <newbase> | --advance <branch>) [--ref-action[=<mode>]] <revision-range>
1313

1414
DESCRIPTION
1515
-----------
1616

17-
Takes ranges of commits and replays them onto a new location. Leaves
17+
Takes a range of commits and replays them onto a new location. Leaves
1818
the working tree and the index untouched. By default, updates the
1919
relevant references using an atomic transaction (all refs update or
2020
none). Use `--ref-action=print` to avoid automatic ref updates and
@@ -55,11 +55,10 @@ which uses the target only as a starting point without updating it.
5555
The default mode can be configured via the `replay.refAction` configuration variable.
5656

5757
<revision-range>::
58-
Range of commits to replay. More than one <revision-range> can
59-
be passed, but in `--advance <branch>` mode, they should have
60-
a single tip, so that it's clear where <branch> should point
61-
to. See "Specifying Ranges" in linkgit:git-rev-parse[1] and the
62-
"Commit Limiting" options below.
58+
Range of commits to replay; see "Specifying Ranges" in
59+
linkgit:git-rev-parse[1]. In `--advance <branch>` mode, the
60+
range should have a single tip, so that it's clear to which tip the
61+
advanced <branch> should point.
6362

6463
include::rev-list-options.adoc[]
6564

builtin/replay.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -366,7 +366,7 @@ int cmd_replay(int argc,
366366
const char *const replay_usage[] = {
367367
N_("(EXPERIMENTAL!) git replay "
368368
"([--contained] --onto <newbase> | --advance <branch>) "
369-
"[--ref-action[=<mode>]] <revision-range>..."),
369+
"[--ref-action[=<mode>]] <revision-range>"),
370370
NULL
371371
};
372372
struct option replay_options[] = {

0 commit comments

Comments
 (0)