summaryrefslogtreecommitdiff
path: root/Documentation/git-rebase.txt
Commit message (Expand)AuthorAgeFilesLines
* rebase: add a config option for --rebase-mergesAlex Henrie2023-03-271-1/+2
* rebase: add documentation and test for --no-rebase-mergesAlex Henrie2023-03-271-7/+11
* rebase: provide better error message for apply options vs. merge configElijah Newren2023-01-251-1/+1
* rebase: fix formatting of rebase --reapply-cherry-picks option in docsElijah Newren2023-01-251-2/+0
* rebase: clarify the OPT_CMDMODE incompatibilitiesElijah Newren2023-01-251-28/+33
* rebase: fix incompatiblity checks for --[no-]reapply-cherry-picksElijah Newren2023-01-251-1/+1
* rebase: fix docs about incompatibilities with --rootElijah Newren2023-01-251-5/+2
* rebase: remove --allow-empty-message from incompatible optsElijah Newren2023-01-251-1/+0
* rebase: mark --update-refs as requiring the merge backendElijah Newren2023-01-251-0/+2
* git-rebase.txt: add a note about 'ORIG_HEAD' being overwrittenPhilippe Blain2023-01-131-0/+7
* Merge branch 'pw/rebase-keep-base-fixes'Taylor Blau2022-10-301-13/+19
|\
| * rebase --keep-base: imply --no-fork-pointPhillip Wood2022-10-171-4/+4
| * rebase --keep-base: imply --reapply-cherry-picksPhillip Wood2022-10-171-10/+16
* | Merge branch 'ab/dedup-config-and-command-docs'Junio C Hamano2022-09-141-0/+2
|\ \
| * | docs: add and use include template for config/* includesÆvar Arnfjörð Bjarmason2022-09-071-0/+2
| |/
* | Merge branch 'jc/rerere-autoupdate-doc'Junio C Hamano2022-08-141-4/+1
|\ \
| * | doc: consolidate --rerere-autoupdate descriptionJunio C Hamano2022-08-031-4/+1
| |/
* | Merge branch 'ds/rebase-update-ref'Junio C Hamano2022-08-011-0/+10
|\ \ | |/ |/|
| * rebase: add rebase.updateRefs config optionDerrick Stolee2022-07-191-0/+3
| * rebase: add --update-refs optionDerrick Stolee2022-07-191-0/+7
* | git-rebase.txt: use back-ticks consistentlyDerrick Stolee2022-06-301-120/+122
|/
* rebase: use correct base for --keep-base when a branch is givenAlex Henrie2022-04-211-2/+3
* update documentation for new zdiff3 conflictStyleElijah Newren2021-12-011-3/+3
* Merge branch 'js/retire-preserve-merges'Junio C Hamano2021-10-181-51/+0
|\
| * rebase: drop support for `--preserve-merges`Johannes Schindelin2021-09-071-51/+0
* | Merge branch 'ws/refer-to-forkpoint-config-in-rebase-doc'Junio C Hamano2021-10-061-1/+2
|\ \
| * | Document `rebase.forkpoint` in rebase man pageWesley Schwengle2021-09-201-1/+2
| |/
* | Merge branch 'js/advise-when-skipping-cherry-picked'Junio C Hamano2021-09-101-4/+8
|\ \
| * | sequencer: advise if skipping cherry-picked commitJosh Steadmon2021-08-301-4/+8
| |/
* | Update docs for change of default merge backendElijah Newren2021-08-051-14/+14
* | git-rebase.txt: correct out-of-date and misleading text about renamesElijah Newren2021-08-051-3/+1
* | merge-strategies.txt: fix simple capitalization errorElijah Newren2021-08-051-1/+1
* | Documentation: edit awkward references to `git merge-recursive`Elijah Newren2021-08-051-3/+2
* | git-rebase.txt: correct antiquated claims about --rebase-mergesElijah Newren2021-08-051-6/+10
|/
* Merge branch 'ab/rebase-no-reschedule-failed-exec'Junio C Hamano2021-05-071-0/+8
|\
| * rebase: don't override --no-reschedule-failed-exec with configÆvar Arnfjörð Bjarmason2021-04-101-0/+8
* | docs: fix linting issues due to incorrect relative section orderÆvar Arnfjörð Bjarmason2021-04-101-6/+6
* | doc/git-commit: add documentation for fixup=[amend|reword] optionsCharvi Mendiratta2021-03-151-10/+11
* | doc/rebase -i: fix typo in the documentation of 'fixup' commandCharvi Mendiratta2021-02-101-1/+1
* | doc/git-rebase: add documentation for fixup [-C|-c] optionsCharvi Mendiratta2021-01-291-3/+11
|/
* Documentation: stylistically normalize references to Signed-off-by:Bradley M. Kuhn2020-10-201-1/+1
* Merge branch 'pb/doc-sequence-editor-configuration'Junio C Hamano2020-09-031-0/+1
|\
| * doc: mention GIT_SEQUENCE_EDITOR and 'sequence.editor' morePhilippe Blain2020-08-311-0/+1
* | Merge branch 'pw/rebase-i-more-options'Junio C Hamano2020-09-031-6/+27
|\ \ | |/ |/|
| * rebase: add --reset-author-dateRohit Ashiwal2020-08-191-0/+1
| * rebase -i: support --ignore-datePhillip Wood2020-08-191-3/+4
| * rebase -i: support --committer-date-is-author-datePhillip Wood2020-08-171-3/+7
| * rebase -i: add --ignore-whitespace flagRohit Ashiwal2020-07-131-2/+17
* | Merge branch 'ma/rebase-doc-typofix' into masterJunio C Hamano2020-07-091-1/+1
|\ \
| * | git-rebase.txt: fix description list separatorMartin Ågren2020-07-091-1/+1
| |/
View Lorry Controller Status