summaryrefslogtreecommitdiff
path: root/builtin/rebase.c
AgeCommit message (Expand)Author
10 daysrebase: provide better error message for apply options vs. merge configElijah Newren
10 daysrebase: put rebase_options initialization in single placeElijah Newren
10 daysrebase: add coverage of other incompatible optionsElijah Newren
10 daysrebase: fix incompatiblity checks for --[no-]reapply-cherry-picksElijah Newren
10 daysrebase: flag --apply and --merge as incompatibleElijah Newren
10 daysrebase: mark --update-refs as requiring the merge backendElijah Newren
2023-01-13rebase: cleanup "--exec" option handlingPhillip Wood
2022-12-14Merge branch 'ab/various-leak-fixes'Junio C Hamano
2022-11-28Merge branch 'ab/fewer-the-index-macros'Junio C Hamano
2022-11-21rebase: don't leak on "--abort"Ævar Arnfjörð Bjarmason
2022-11-21built-ins & libs & helpers: add/move destructors, fix leaksÆvar Arnfjörð Bjarmason
2022-11-21cocci: apply "pending" index-compatibility to some "builtin/*.c"Ævar Arnfjörð Bjarmason
2022-11-09rebase: stop exporting GIT_REFLOG_ACTIONPhillip Wood
2022-10-31Merge branch 'pw/rebase-reflog-fixes'Taylor Blau
2022-10-31Merge branch 'pw/rebase-keep-base-fixes'Taylor Blau
2022-10-17rebase: cleanup action handlingPhillip Wood
2022-10-17rebase --abort: improve reflog messagePhillip Wood
2022-10-17rebase --apply: make reflog messages match rebase --mergePhillip Wood
2022-10-17rebase --apply: respect GIT_REFLOG_ACTIONPhillip Wood
2022-10-17rebase --merge: fix reflog message after skippingPhillip Wood
2022-10-17rebase --merge: fix reflog when continuingPhillip Wood
2022-10-17rebase --apply: remove duplicated codePhillip Wood
2022-10-17rebase --keep-base: imply --no-fork-pointPhillip Wood
2022-10-17rebase --keep-base: imply --reapply-cherry-picksPhillip Wood
2022-10-17rebase: factor out branch_base calculationPhillip Wood
2022-10-17rebase: rename merge_base to branch_basePhillip Wood
2022-10-17rebase: store orig_head as a commitPhillip Wood
2022-10-17rebase: be stricter when reading state files containing oidsPhillip Wood
2022-07-19rebase: add rebase.updateRefs config optionDerrick Stolee
2022-07-19rebase: add --update-refs optionDerrick Stolee
2022-06-16builtin/rebase: remove a redundant space in l10n stringFangyi Zhou
2022-06-15Merge branch 'po/rebase-preserve-merges'Junio C Hamano
2022-06-06rebase: translate a die(preserve-merges) messagePhilip Oakley
2022-06-06rebase: note `preserve` merges may be a pull config optionPhilip Oakley
2022-06-06rebase: help users when dying with `preserve-merges`Philip Oakley
2022-06-06rebase.c: state preserve-merges has been removedPhilip Oakley
2022-05-11Merge branch 'ea/rebase-code-simplify'Junio C Hamano
2022-04-21rebase: use correct base for --keep-base when a branch is givenAlex Henrie
2022-04-20rebase: simplify an assignment of options.type in cmd_rebaseEdmundo Carmona Antoranz
2022-03-18rebase: set REF_HEAD_DETACH in checkout_up_to_date()John Cai
2022-02-25Merge branch 'ja/i18n-common-messages'Junio C Hamano
2022-02-18Merge branch 'pw/use-in-process-checkout-in-rebase'Junio C Hamano
2022-02-09Merge branch 'ab/config-based-hooks-2'Junio C Hamano
2022-02-04i18n: remove from i18n strings that do not hold translatable partsJean-Noël Avila
2022-01-26rebase --apply: set ORIG_HEAD correctlyPhillip Wood
2022-01-26rebase --apply: fix reflogPhillip Wood
2022-01-26reset_head(): take struct rebase_head_optsPhillip Wood
2022-01-26rebase: cleanup reset_head() callsPhillip Wood
2022-01-26create_autostash(): remove unneeded parameterPhillip Wood
2022-01-26reset_head(): make default_reflog_action optionalPhillip Wood