diff options
| author | Ævar Arnfjörð Bjarmason <avarab@gmail.com> | 2021-04-09 17:02:50 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-04-10 23:36:34 -0700 |
| commit | 414abf159f9137ea9e4239f3c34d91310edc817d (patch) | |
| tree | a4a56d24453fe6255b44af0fd98d3aa536c037cd /Documentation/git-rebase.txt | |
| parent | ea8b9271b17e64502dc80981cf09cec42739dce7 (diff) | |
| download | git-414abf159f9137ea9e4239f3c34d91310edc817d.tar.gz | |
docs: fix linting issues due to incorrect relative section order
Re-order the sections of a few manual pages to be consistent with the
entirety of the rest of our documentation. This allows us to remove
the just-added whitelist of "bad" order from
lint-man-section-order.perl.
I'm doing that this way around so that code will be easy to dig up if
we'll need it in the future. I've intentionally not added some other
sections such as EXAMPLES to the list of known sections.
If we were to add that we'd find some out of order. Perhaps we'll want
to order those consistently as well in the future, at which point
whitelisting some of them might become handy again.
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-rebase.txt')
| -rw-r--r-- | Documentation/git-rebase.txt | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt index f08ae27e2a..8423d46372 100644 --- a/Documentation/git-rebase.txt +++ b/Documentation/git-rebase.txt @@ -200,12 +200,6 @@ Alternatively, you can undo the 'git rebase' with git rebase --abort -CONFIGURATION -------------- - -include::config/rebase.txt[] -include::config/sequencer.txt[] - OPTIONS ------- --onto <newbase>:: @@ -1266,6 +1260,12 @@ merge tlsv1.3 merge cmake ------------ +CONFIGURATION +------------- + +include::config/rebase.txt[] +include::config/sequencer.txt[] + BUGS ---- The todo list presented by the deprecated `--preserve-merges --interactive` |