summaryrefslogtreecommitdiff
path: root/builtin/rebase.c
AgeCommit message (Expand)AuthorFilesLines
2022-02-25Merge branch 'ja/i18n-common-messages'Libravatar Junio C Hamano1-1/+1
2022-02-18Merge branch 'pw/use-in-process-checkout-in-rebase'Libravatar Junio C Hamano1-41/+60
2022-02-09Merge branch 'ab/config-based-hooks-2'Libravatar Junio C Hamano1-1/+2
2022-02-04i18n: remove from i18n strings that do not hold translatable partsLibravatar Jean-Noël Avila1-1/+1
2022-01-26rebase --apply: set ORIG_HEAD correctlyLibravatar Phillip Wood1-0/+1
2022-01-26rebase --apply: fix reflogLibravatar Phillip Wood1-4/+4
2022-01-26reset_head(): take struct rebase_head_optsLibravatar Phillip Wood1-21/+36
2022-01-26rebase: cleanup reset_head() callsLibravatar Phillip Wood1-2/+2
2022-01-26create_autostash(): remove unneeded parameterLibravatar Phillip Wood1-4/+4
2022-01-26reset_head(): make default_reflog_action optionalLibravatar Phillip Wood1-6/+4
2022-01-26reset_head(): remove action parameterLibravatar Phillip Wood1-7/+7
2022-01-26rebase: factor out checkout for up to date branchLibravatar Phillip Wood1-14/+19
2022-01-07rebase: convert pre-rebase to use hook.hLibravatar Emily Shaffer1-1/+2
2022-01-05i18n: turn even more messages into "cannot be used together" onesLibravatar Jean-Noël Avila1-2/+2
2022-01-05i18n: turn "options are incompatible" into "cannot be used together"Libravatar Jean-Noël Avila1-3/+3
2021-10-18Merge branch 'js/retire-preserve-merges'Libravatar Junio C Hamano1-324/+14
2021-10-06Merge branch 'pw/rebase-of-a-tag-fix'Libravatar Junio C Hamano1-28/+21
2021-09-22rebase: dereference tagsLibravatar Phillip Wood1-6/+8
2021-09-22rebase: use lookup_commit_reference_by_name()Libravatar Phillip Wood1-13/+4
2021-09-22rebase: use our standard error return valueLibravatar Phillip Wood1-9/+9
2021-09-20Merge branch 'js/run-command-close-packs'Libravatar Junio C Hamano1-1/+0
2021-09-20Merge branch 'ds/mergies-with-sparse-index'Libravatar Junio C Hamano1-0/+6
2021-09-10Merge branch 'js/advise-when-skipping-cherry-picked'Libravatar Junio C Hamano1-0/+1
2021-09-09sparse-index: integrate with cherry-pick and rebaseLibravatar Derrick Stolee1-0/+6
2021-09-09run_auto_maintenance(): implicitly close the object storeLibravatar Johannes Schindelin1-1/+0
2021-09-08Merge branch 'ab/rebase-fatal-fatal-fix'Libravatar Junio C Hamano1-1/+1
2021-09-07rebase: stop mentioning the -p option in commentsLibravatar Johannes Schindelin1-1/+1
2021-09-07rebase: remove obsolete code commentLibravatar Johannes Schindelin1-1/+1
2021-09-07rebase: drop the internal `rebase--interactive` commandLibravatar Johannes Schindelin1-192/+1
2021-09-07rebase: drop support for `--preserve-merges`Libravatar Johannes Schindelin1-127/+11
2021-08-30sequencer: advise if skipping cherry-picked commitLibravatar Josh Steadmon1-0/+1
2021-08-30Merge branch 'en/ort-becomes-the-default'Libravatar Junio C Hamano1-1/+1
2021-08-24rebase: emit one "fatal" in "fatal: fatal: <error>"Libravatar Ævar Arnfjörð Bjarmason1-1/+1
2021-08-05Change default merge backend from recursive to ortLibravatar Elijah Newren1-1/+1
2021-07-26builtin/rebase: fix options.strategy memory lifecycleLibravatar Andrzej Hunt1-1/+2
2021-05-10Merge branch 'bc/hash-transition-interop-part-1'Libravatar Junio C Hamano1-2/+2
2021-05-07Merge branch 'ah/plugleaks'Libravatar Junio C Hamano1-0/+1
2021-04-28builtin/rebase: release git_format_patch_opt tooLibravatar Andrzej Hunt1-0/+1
2021-04-27hash: provide per-algorithm null OIDsLibravatar brian m. carlson1-2/+2
2021-04-16Merge branch 'en/ort-readiness'Libravatar Junio C Hamano1-0/+1
2021-03-23rebase: remove transitory rebase.useBuiltin setting & envLibravatar Ævar Arnfjörð Bjarmason1-11/+0
2021-03-20merge-ort: write $GIT_DIR/AUTO_MERGE whenever we hit a conflictLibravatar Elijah Newren1-0/+1
2021-02-24rebase: add a config option for --no-fork-pointLibravatar Alex Henrie1-7/+13
2021-01-15Merge branch 'rs/rebase-commit-validation'Libravatar Junio C Hamano1-1/+3
2021-01-04rebase: verify commit parameterLibravatar René Scharfe1-1/+3
2020-11-18Merge branch 'en/merge-ort-api-null-impl'Libravatar Junio C Hamano1-1/+12
2020-11-18Merge branch 'pw/rebase-i-orig-head'Libravatar Junio C Hamano1-10/+10
2020-11-04rebase -i: simplify get_revision_ranges()Libravatar Phillip Wood1-6/+4
2020-11-04rebase -i: use struct object_id when writing stateLibravatar Phillip Wood1-2/+3
2020-11-04rebase -i: use struct object_id rather than looking up commitLibravatar Phillip Wood1-2/+3
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-15 00:45:13 +0000