summaryrefslogtreecommitdiffstats
path: root/Documentation/git-rebase.txt (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jc/doc-rebase-fuzz-vs-offset-fix'Junio C Hamano2024-08-011-1/+1
|\
| * doc: difference in location to apply is "offset", not "fuzz"Junio C Hamano2024-07-251-1/+1
* | Merge branch 'bl/cherry-pick-empty'Junio C Hamano2024-04-031-9/+17
|\ \
| * | rebase: update `--empty=ask` to `--empty=stop`Brian Lyles2024-03-261-7/+8
| * | docs: clean up `--empty` formatting in git-rebase(1) and git-am(1)Brian Lyles2024-03-261-9/+16
| * | docs: address inaccurate `--empty` default with `--exec`Brian Lyles2024-03-261-5/+5
* | | Merge branch 'ja/doc-formatting-fix'Junio C Hamano2024-03-261-1/+1
|\ \ \ | |/ / |/| |
| * | doc: format alternatives in synopsisJean-Noël Avila2024-03-161-1/+1
* | | Merge branch 'ak/rebase-autosquash'Junio C Hamano2024-03-051-1/+1
|\ \ \ | |/ / |/| |
| * | rebase: fix typo in autosquash documentationRichard Macklin2024-02-271-1/+1
* | | Merge branch 'nb/rebase-x-shell-docfix'Junio C Hamano2024-01-301-4/+3
|\ \ \
| * | | rebase: fix documentation about used shell in -xNikolay Borisov2024-01-181-4/+3
* | | | Merge branch 'ib/rebase-reschedule-doc'Junio C Hamano2024-01-161-7/+10
|\ \ \ \
| * | | | rebase: clarify --reschedule-failed-exec defaultIllia Bobyr2024-01-051-7/+10
| |/ / /
* | | | Merge branch 'ms/rebase-insnformat-doc-fix'Junio C Hamano2024-01-131-1/+1
|\ \ \ \ | |_|/ / |/| | |
| * | | Documentation: fix statement about rebase.instructionFormatMaarten van der Schrieck2024-01-031-1/+1
| | |/ | |/|
* | | rebase: rewrite --(no-)autosquash documentationAndy Koppe2023-11-161-14/+20
* | | rebase: support --autosquash without -iAndy Koppe2023-11-161-1/+1
| |/ |/|
* | am, rebase: fix arghelp syntax of --emptyRené Scharfe2023-10-291-2/+2
* | 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-311-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-151-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-191-51/+0
|\
| * rebase: drop support for `--preserve-merges`Johannes Schindelin2021-09-081-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-311-4/+8
| |/
* | Update docs for change of default merge backendElijah Newren2021-08-061-14/+14
* | git-rebase.txt: correct out-of-date and misleading text about renamesElijah Newren2021-08-051-3/+1
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-19 00:15:50 +0100