summaryrefslogtreecommitdiff
path: root/builtin/rebase.c
AgeCommit message (Expand)Author
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
2022-01-26reset_head(): remove action parameterPhillip Wood
2022-01-26rebase: factor out checkout for up to date branchPhillip Wood
2022-01-07rebase: convert pre-rebase to use hook.hEmily Shaffer
2022-01-05i18n: turn even more messages into "cannot be used together" onesJean-Noël Avila
2022-01-05i18n: turn "options are incompatible" into "cannot be used together"Jean-Noël Avila
2021-10-18Merge branch 'js/retire-preserve-merges'Junio C Hamano
2021-10-06Merge branch 'pw/rebase-of-a-tag-fix'Junio C Hamano
2021-09-22rebase: dereference tagsPhillip Wood
2021-09-22rebase: use lookup_commit_reference_by_name()Phillip Wood
2021-09-22rebase: use our standard error return valuePhillip Wood
2021-09-20Merge branch 'js/run-command-close-packs'Junio C Hamano
2021-09-20Merge branch 'ds/mergies-with-sparse-index'Junio C Hamano
2021-09-10Merge branch 'js/advise-when-skipping-cherry-picked'Junio C Hamano
2021-09-09sparse-index: integrate with cherry-pick and rebaseDerrick Stolee
2021-09-09run_auto_maintenance(): implicitly close the object storeJohannes Schindelin
2021-09-08Merge branch 'ab/rebase-fatal-fatal-fix'Junio C Hamano
2021-09-08rebase: stop mentioning the -p option in commentsJohannes Schindelin
2021-09-08rebase: remove obsolete code commentJohannes Schindelin
2021-09-08rebase: drop the internal `rebase--interactive` commandJohannes Schindelin
2021-09-08rebase: drop support for `--preserve-merges`Johannes Schindelin
2021-08-30sequencer: advise if skipping cherry-picked commitJosh Steadmon
2021-08-30Merge branch 'en/ort-becomes-the-default'Junio C Hamano
2021-08-24rebase: emit one "fatal" in "fatal: fatal: <error>"Ævar Arnfjörð Bjarmason
2021-08-05Change default merge backend from recursive to ortElijah Newren
2021-07-26builtin/rebase: fix options.strategy memory lifecycleAndrzej Hunt
2021-05-10Merge branch 'bc/hash-transition-interop-part-1'Junio C Hamano
2021-05-07Merge branch 'ah/plugleaks'Junio C Hamano
2021-04-28builtin/rebase: release git_format_patch_opt tooAndrzej Hunt
2021-04-27hash: provide per-algorithm null OIDsbrian m. carlson
2021-04-16Merge branch 'en/ort-readiness'Junio C Hamano
2021-03-23rebase: remove transitory rebase.useBuiltin setting & envÆvar Arnfjörð Bjarmason
2021-03-20merge-ort: write $GIT_DIR/AUTO_MERGE whenever we hit a conflictElijah Newren
2021-02-24rebase: add a config option for --no-fork-pointAlex Henrie
2021-01-15Merge branch 'rs/rebase-commit-validation'Junio C Hamano
2021-01-04rebase: verify commit parameterRené Scharfe
2020-11-18Merge branch 'en/merge-ort-api-null-impl'Junio C Hamano
generated by cgit v0.10.2-6-g49f6 at 2024-05-13 12:13:03 (GMT)