aboutsummaryrefslogtreecommitdiffstats
path: root/Documentation/git-rebase.txt (follow)
AgeCommit message (Expand)AuthorFilesLines
2025-01-21doc: use .adoc extension for AsciiDoc filesbrian m. carlson1-1304/+0
2024-08-01Merge branch 'jc/doc-rebase-fuzz-vs-offset-fix'Junio C Hamano1-1/+1
2024-07-25doc: difference in location to apply is "offset", not "fuzz"Junio C Hamano1-1/+1
2024-04-03Merge branch 'bl/cherry-pick-empty'Junio C Hamano1-9/+17
2024-03-25rebase: update `--empty=ask` to `--empty=stop`Brian Lyles1-7/+8
2024-03-25docs: clean up `--empty` formatting in git-rebase(1) and git-am(1)Brian Lyles1-9/+16
2024-03-25docs: address inaccurate `--empty` default with `--exec`Brian Lyles1-5/+5
2024-03-25Merge branch 'ja/doc-formatting-fix'Junio C Hamano1-1/+1
2024-03-16doc: format alternatives in synopsisJean-Noël Avila1-1/+1
2024-03-05Merge branch 'ak/rebase-autosquash'Junio C Hamano1-1/+1
2024-02-27rebase: fix typo in autosquash documentationRichard Macklin1-1/+1
2024-01-29Merge branch 'nb/rebase-x-shell-docfix'Junio C Hamano1-4/+3
2024-01-17rebase: fix documentation about used shell in -xNikolay Borisov1-4/+3
2024-01-16Merge branch 'ib/rebase-reschedule-doc'Junio C Hamano1-7/+10
2024-01-12Merge branch 'ms/rebase-insnformat-doc-fix'Junio C Hamano1-1/+1
2024-01-05rebase: clarify --reschedule-failed-exec defaultIllia Bobyr1-7/+10
2024-01-03Documentation: fix statement about rebase.instructionFormatMaarten van der Schrieck1-1/+1
2023-11-16rebase: rewrite --(no-)autosquash documentationAndy Koppe1-14/+20
2023-11-16rebase: support --autosquash without -iAndy Koppe1-1/+1
2023-10-29am, rebase: fix arghelp syntax of --emptyRené Scharfe1-2/+2
2023-03-27rebase: add a config option for --rebase-mergesAlex Henrie1-1/+2
2023-03-27rebase: add documentation and test for --no-rebase-mergesAlex Henrie1-7/+11
2023-01-25rebase: provide better error message for apply options vs. merge configElijah Newren1-1/+1
2023-01-25rebase: fix formatting of rebase --reapply-cherry-picks option in docsElijah Newren1-2/+0
2023-01-25rebase: clarify the OPT_CMDMODE incompatibilitiesElijah Newren1-28/+33
2023-01-25rebase: fix incompatiblity checks for --[no-]reapply-cherry-picksElijah Newren1-1/+1
2023-01-25rebase: fix docs about incompatibilities with --rootElijah Newren1-5/+2
2023-01-25rebase: remove --allow-empty-message from incompatible optsElijah Newren1-1/+0
2023-01-25rebase: mark --update-refs as requiring the merge backendElijah Newren1-0/+2
2023-01-13git-rebase.txt: add a note about 'ORIG_HEAD' being overwrittenPhilippe Blain1-0/+7
2022-10-30Merge branch 'pw/rebase-keep-base-fixes'Taylor Blau1-13/+19
2022-10-17rebase --keep-base: imply --no-fork-pointPhillip Wood1-4/+4
2022-10-17rebase --keep-base: imply --reapply-cherry-picksPhillip Wood1-10/+16
2022-09-14Merge branch 'ab/dedup-config-and-command-docs'Junio C Hamano1-0/+2
2022-09-07docs: add and use include template for config/* includesÆvar Arnfjörð Bjarmason1-0/+2
2022-08-14Merge branch 'jc/rerere-autoupdate-doc'Junio C Hamano1-4/+1
2022-08-03doc: consolidate --rerere-autoupdate descriptionJunio C Hamano1-4/+1
2022-08-01Merge branch 'ds/rebase-update-ref'Junio C Hamano1-0/+10
2022-07-19rebase: add rebase.updateRefs config optionDerrick Stolee1-0/+3
2022-07-19rebase: add --update-refs optionDerrick Stolee1-0/+7
2022-06-30git-rebase.txt: use back-ticks consistentlyDerrick Stolee1-120/+122
2022-04-21rebase: use correct base for --keep-base when a branch is givenAlex Henrie1-2/+3
2021-12-01update documentation for new zdiff3 conflictStyleElijah Newren1-3/+3
2021-10-18Merge branch 'js/retire-preserve-merges'Junio C Hamano1-51/+0
2021-10-06Merge branch 'ws/refer-to-forkpoint-config-in-rebase-doc'Junio C Hamano1-1/+2
2021-09-20Document `rebase.forkpoint` in rebase man pageWesley Schwengle1-1/+2
2021-09-10Merge branch 'js/advise-when-skipping-cherry-picked'Junio C Hamano1-4/+8
2021-09-07rebase: drop support for `--preserve-merges`Johannes Schindelin1-51/+0
2021-08-30sequencer: advise if skipping cherry-picked commitJosh Steadmon1-4/+8
2021-08-05Update docs for change of default merge backendElijah Newren1-14/+14
generated by cgit v1.2.3 (git 2.39.1) at 2026-01-07 02:06:50 +0000