summaryrefslogtreecommitdiff
path: root/Documentation/git-rebase.txt
AgeCommit message (Expand)Author
2023-01-13git-rebase.txt: add a note about 'ORIG_HEAD' being overwrittenPhilippe Blain
2022-10-31Merge branch 'pw/rebase-keep-base-fixes'Taylor Blau
2022-10-17rebase --keep-base: imply --no-fork-pointPhillip Wood
2022-10-17rebase --keep-base: imply --reapply-cherry-picksPhillip Wood
2022-09-14Merge branch 'ab/dedup-config-and-command-docs'Junio C Hamano
2022-09-07docs: add and use include template for config/* includesÆvar Arnfjörð Bjarmason
2022-08-15Merge branch 'jc/rerere-autoupdate-doc'Junio C Hamano
2022-08-03doc: consolidate --rerere-autoupdate descriptionJunio C Hamano
2022-08-01Merge branch 'ds/rebase-update-ref'Junio C Hamano
2022-07-19rebase: add rebase.updateRefs config optionDerrick Stolee
2022-07-19rebase: add --update-refs optionDerrick Stolee
2022-06-30git-rebase.txt: use back-ticks consistentlyDerrick Stolee
2022-04-21rebase: use correct base for --keep-base when a branch is givenAlex Henrie
2021-12-01update documentation for new zdiff3 conflictStyleElijah Newren
2021-10-18Merge branch 'js/retire-preserve-merges'Junio C Hamano
2021-10-06Merge branch 'ws/refer-to-forkpoint-config-in-rebase-doc'Junio C Hamano
2021-09-20Document `rebase.forkpoint` in rebase man pageWesley Schwengle
2021-09-10Merge branch 'js/advise-when-skipping-cherry-picked'Junio C Hamano
2021-09-08rebase: drop support for `--preserve-merges`Johannes Schindelin
2021-08-30sequencer: advise if skipping cherry-picked commitJosh Steadmon
2021-08-05Update docs for change of default merge backendElijah Newren
2021-08-05git-rebase.txt: correct out-of-date and misleading text about renamesElijah Newren
2021-08-05merge-strategies.txt: fix simple capitalization errorElijah Newren
2021-08-05Documentation: edit awkward references to `git merge-recursive`Elijah Newren
2021-08-05git-rebase.txt: correct antiquated claims about --rebase-mergesElijah Newren
2021-05-07Merge branch 'ab/rebase-no-reschedule-failed-exec'Junio C Hamano
2021-04-11docs: fix linting issues due to incorrect relative section orderÆvar Arnfjörð Bjarmason
2021-04-11rebase: don't override --no-reschedule-failed-exec with configÆvar Arnfjörð Bjarmason
2021-03-15doc/git-commit: add documentation for fixup=[amend|reword] optionsCharvi Mendiratta
2021-02-10doc/rebase -i: fix typo in the documentation of 'fixup' commandCharvi Mendiratta
2021-01-29doc/git-rebase: add documentation for fixup [-C|-c] optionsCharvi Mendiratta
2020-10-20Documentation: stylistically normalize references to Signed-off-by:Bradley M. Kuhn
2020-09-03Merge branch 'pb/doc-sequence-editor-configuration'Junio C Hamano
2020-09-03Merge branch 'pw/rebase-i-more-options'Junio C Hamano
2020-08-31doc: mention GIT_SEQUENCE_EDITOR and 'sequence.editor' morePhilippe Blain
2020-08-19rebase: add --reset-author-dateRohit Ashiwal
2020-08-19rebase -i: support --ignore-datePhillip Wood
2020-08-17rebase -i: support --committer-date-is-author-datePhillip Wood
2020-07-13rebase -i: add --ignore-whitespace flagRohit Ashiwal
2020-07-09Merge branch 'ma/rebase-doc-typofix' into masterJunio C Hamano
2020-07-09git-rebase.txt: fix description list separatorMartin Ågren
2020-05-05Doc: reference the "stash list" in autostash docsDenton Liu
2020-05-01Merge branch 'en/rebase-root-and-fork-point-are-incompatible'Junio C Hamano
2020-04-29Merge branch 'dl/merge-autostash-rebase-quit-fix'Junio C Hamano
2020-04-28Merge branch 'en/rebase-doc-hooks-called-by-accident'Junio C Hamano
2020-04-28rebase: save autostash entry into stash reflog on --quitDenton Liu
2020-04-27rebase: display an error if --root and --fork-point are both providedElijah Newren
2020-04-22Merge branch 'jt/rebase-allow-duplicate'Junio C Hamano
2020-04-22Merge branch 'en/rebase-no-keep-empty'Junio C Hamano
2020-04-22Merge branch 'dd/no-gpg-sign'Junio C Hamano