summaryrefslogtreecommitdiffstats
path: root/builtin/rebase.c (follow)
Commit message (Expand)AuthorAgeFilesLines
* rebase: stop reading and writing unnecessary strategy statePhillip Wood2023-04-101-24/+0
* Merge branch 'jk/format-patch-ignore-noprefix'Junio C Hamano2023-03-211-1/+1
|\
| * rebase: prefer --default-prefix to --{src,dst}-prefix for format-patchJeff King2023-03-131-1/+1
* | Merge branch 'fz/rebase-msg-update'Junio C Hamano2023-03-171-1/+1
|\ \
| * | rebase: fix capitalisation autoSquash in i18n stringFangyi Zhou2023-02-271-1/+1
| |/
* / cache.h: remove dependence on hex.h; make other files include it explicitlyElijah Newren2023-02-241-0/+1
|/
* builtin/rebase.c: free() "options.strategy_opts"Ævar Arnfjörð Bjarmason2023-02-071-0/+1
* builtin/rebase.c: fix "options.onto_name" leakÆvar Arnfjörð Bjarmason2023-02-071-1/+3
* sequencer API users: fix get_replay_opts() leaksÆvar Arnfjörð Bjarmason2023-02-071-0/+4
* rebase: use "cleanup" pattern in do_interactive_rebase()Ævar Arnfjörð Bjarmason2023-02-071-8/+5
* rebase: provide better error message for apply options vs. merge configElijah Newren2023-01-251-6/+21
* rebase: put rebase_options initialization in single placeElijah Newren2023-01-251-2/+2
* rebase: add coverage of other incompatible optionsElijah Newren2023-01-251-0/+3
* rebase: fix incompatiblity checks for --[no-]reapply-cherry-picksElijah Newren2023-01-251-13/+21
* rebase: flag --apply and --merge as incompatibleElijah Newren2023-01-251-2/+10
* rebase: mark --update-refs as requiring the merge backendElijah Newren2023-01-251-0/+3
* rebase: cleanup "--exec" option handlingPhillip Wood2023-01-131-34/+11
* Merge branch 'ab/various-leak-fixes'Junio C Hamano2022-12-141-0/+4
|\
| * rebase: don't leak on "--abort"Ævar Arnfjörð Bjarmason2022-11-211-0/+1
| * built-ins & libs & helpers: add/move destructors, fix leaksÆvar Arnfjörð Bjarmason2022-11-211-0/+3
* | Merge branch 'ab/fewer-the-index-macros'Junio C Hamano2022-11-281-3/+3
|\ \ | |/ |/|
| * cocci: apply "pending" index-compatibility to some "builtin/*.c"Ævar Arnfjörð Bjarmason2022-11-211-3/+3
* | rebase: stop exporting GIT_REFLOG_ACTIONPhillip Wood2022-11-101-12/+15
|/
* 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
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-19 03:19:30 +0100