summaryrefslogtreecommitdiff
path: root/Documentation/git-rebase.txt
AgeCommit message (Expand)Author
2024-04-03Merge branch 'bl/cherry-pick-empty'Junio C Hamano
2024-03-25rebase: update `--empty=ask` to `--empty=stop`Brian Lyles
2024-03-25docs: clean up `--empty` formatting in git-rebase(1) and git-am(1)Brian Lyles
2024-03-25docs: address inaccurate `--empty` default with `--exec`Brian Lyles
2024-03-25Merge branch 'ja/doc-formatting-fix'Junio C Hamano
2024-03-16doc: format alternatives in synopsisJean-Noël Avila
2024-03-05Merge branch 'ak/rebase-autosquash'Junio C Hamano
2024-02-27rebase: fix typo in autosquash documentationRichard Macklin
2024-01-30Merge branch 'nb/rebase-x-shell-docfix'Junio C Hamano
2024-01-18rebase: fix documentation about used shell in -xNikolay Borisov
2024-01-16Merge branch 'ib/rebase-reschedule-doc'Junio C Hamano
2024-01-13Merge branch 'ms/rebase-insnformat-doc-fix'Junio C Hamano
2024-01-05rebase: clarify --reschedule-failed-exec defaultIllia Bobyr
2024-01-03Documentation: fix statement about rebase.instructionFormatMaarten van der Schrieck
2023-11-16rebase: rewrite --(no-)autosquash documentationAndy Koppe
2023-11-16rebase: support --autosquash without -iAndy Koppe
2023-10-29am, rebase: fix arghelp syntax of --emptyRené Scharfe
2023-03-27rebase: add a config option for --rebase-mergesAlex Henrie
2023-03-27rebase: add documentation and test for --no-rebase-mergesAlex Henrie
2023-01-25rebase: provide better error message for apply options vs. merge configElijah Newren
2023-01-25rebase: fix formatting of rebase --reapply-cherry-picks option in docsElijah Newren
2023-01-25rebase: clarify the OPT_CMDMODE incompatibilitiesElijah Newren
2023-01-25rebase: fix incompatiblity checks for --[no-]reapply-cherry-picksElijah Newren
2023-01-25rebase: fix docs about incompatibilities with --rootElijah Newren
2023-01-25rebase: remove --allow-empty-message from incompatible optsElijah Newren
2023-01-25rebase: mark --update-refs as requiring the merge backendElijah Newren
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
generated by cgit v0.10.2-6-g49f6 at 2024-04-26 16:37:38 (GMT)