diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2021-05-07 12:47:40 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-05-07 12:47:40 +0900 |
| commit | 5a357fa477bd9d7f9190cca3e5a7ef1186c3d64a (patch) | |
| tree | 97fb917d26fca31d34243366973a0db0a878734e /Documentation/git-rebase.txt | |
| parent | Merge branch 'mt/add-rm-in-sparse-checkout' (diff) | |
| parent | docs: fix linting issues due to incorrect relative section order (diff) | |
| download | tgif-5a357fa477bd9d7f9190cca3e5a7ef1186c3d64a.tar.xz | |
Merge branch 'ab/doc-lint'
Dev support.
* ab/doc-lint:
docs: fix linting issues due to incorrect relative section order
doc lint: lint relative section order
doc lint: lint and fix missing "GIT" end sections
doc lint: fix bugs in, simplify and improve lint script
doc lint: Perl "strict" and "warnings" in lint-gitlink.perl
Documentation/Makefile: make doc.dep dependencies a variable again
Documentation/Makefile: make $(wildcard howto/*.txt) a var
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` |