summaryrefslogtreecommitdiffstats
path: root/builtin/rebase.c (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'pw/rebase-reflog-fixes'Taylor Blau2022-10-311-87/+59
|\
| * rebase: cleanup action handlingPhillip Wood2022-10-171-49/+44
| * rebase --abort: improve reflog messagePhillip Wood2022-10-171-20/+8
| * rebase --apply: make reflog messages match rebase --mergePhillip Wood2022-10-171-4/+5
| * rebase --apply: respect GIT_REFLOG_ACTIONPhillip Wood2022-10-171-3/+4
| * rebase --merge: fix reflog message after skippingPhillip Wood2022-10-171-2/+0
| * rebase --merge: fix reflog when continuingPhillip Wood2022-10-171-2/+0
| * rebase --apply: remove duplicated codePhillip Wood2022-10-171-10/+1
* | Merge branch 'pw/rebase-keep-base-fixes'Taylor Blau2022-10-311-61/+83
|\|
| * rebase --keep-base: imply --no-fork-pointPhillip Wood2022-10-171-0/+6
| * rebase --keep-base: imply --reapply-cherry-picksPhillip Wood2022-10-171-1/+15
| * rebase: factor out branch_base calculationPhillip Wood2022-10-171-13/+20
| * rebase: rename merge_base to branch_basePhillip Wood2022-10-171-15/+15
| * rebase: store orig_head as a commitPhillip Wood2022-10-171-35/+31
| * rebase: be stricter when reading state files containing oidsPhillip Wood2022-10-171-4/+4
* | rebase: add rebase.updateRefs config optionDerrick Stolee2022-07-191-0/+5
* | rebase: add --update-refs optionDerrick Stolee2022-07-191-0/+5
|/
* builtin/rebase: remove a redundant space in l10n stringFangyi Zhou2022-06-161-1/+1
* Merge branch 'po/rebase-preserve-merges'Junio C Hamano2022-06-161-5/+9
|\
| * rebase: translate a die(preserve-merges) messagePhilip Oakley2022-06-061-2/+2
| * rebase: note `preserve` merges may be a pull config optionPhilip Oakley2022-06-061-1/+3
| * rebase: help users when dying with `preserve-merges`Philip Oakley2022-06-061-2/+4
| * rebase.c: state preserve-merges has been removedPhilip Oakley2022-06-061-2/+2
* | Merge branch 'ea/rebase-code-simplify'Junio C Hamano2022-05-111-4/+2
|\ \
| * | rebase: simplify an assignment of options.type in cmd_rebaseEdmundo Carmona Antoranz2022-04-201-4/+2
* | | rebase: use correct base for --keep-base when a branch is givenAlex Henrie2022-04-211-27/+28
| |/ |/|
* | rebase: set REF_HEAD_DETACH in checkout_up_to_date()John Cai2022-03-181-0/+2
* | Merge branch 'ja/i18n-common-messages'Junio C Hamano2022-02-261-1/+1
|\ \
| * | i18n: remove from i18n strings that do not hold translatable partsJean-Noël Avila2022-02-041-1/+1
| |/
* | Merge branch 'pw/use-in-process-checkout-in-rebase'Junio C Hamano2022-02-181-41/+60
|\ \
| * | rebase --apply: set ORIG_HEAD correctlyPhillip Wood2022-01-261-0/+1
| * | rebase --apply: fix reflogPhillip Wood2022-01-261-4/+4
| * | reset_head(): take struct rebase_head_optsPhillip Wood2022-01-261-21/+36
| * | rebase: cleanup reset_head() callsPhillip Wood2022-01-261-2/+2
| * | create_autostash(): remove unneeded parameterPhillip Wood2022-01-261-4/+4
| * | reset_head(): make default_reflog_action optionalPhillip Wood2022-01-261-6/+4
| * | reset_head(): remove action parameterPhillip Wood2022-01-261-7/+7
| * | rebase: factor out checkout for up to date branchPhillip Wood2022-01-261-14/+19
* | | Merge branch 'ab/config-based-hooks-2'Junio C Hamano2022-02-091-1/+2
|\ \ \ | |_|/ |/| |
| * | rebase: convert pre-rebase to use hook.hEmily Shaffer2022-01-081-1/+2
| |/
* | i18n: turn even more messages into "cannot be used together" onesJean-Noël Avila2022-01-051-2/+2
* | i18n: turn "options are incompatible" into "cannot be used together"Jean-Noël Avila2022-01-051-3/+3
|/
* Merge branch 'js/retire-preserve-merges'Junio C Hamano2021-10-191-324/+14
|\
| * rebase: stop mentioning the -p option in commentsJohannes Schindelin2021-09-081-1/+1
| * rebase: remove obsolete code commentJohannes Schindelin2021-09-081-1/+1
| * rebase: drop the internal `rebase--interactive` commandJohannes Schindelin2021-09-081-192/+1
| * rebase: drop support for `--preserve-merges`Johannes Schindelin2021-09-081-127/+11
* | Merge branch 'pw/rebase-of-a-tag-fix'Junio C Hamano2021-10-061-28/+21
|\ \
| * | rebase: dereference tagsPhillip Wood2021-09-221-6/+8
| * | rebase: use lookup_commit_reference_by_name()Phillip Wood2021-09-221-13/+4
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-19 05:48:50 +0100