summaryrefslogtreecommitdiff
path: root/builtin/rebase.c
AgeCommit message (Expand)Author
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
2020-11-18Merge branch 'pw/rebase-i-orig-head'Junio C Hamano
2020-11-04rebase -i: simplify get_revision_ranges()Phillip Wood
2020-11-04rebase -i: use struct object_id when writing statePhillip Wood
2020-11-04rebase -i: use struct object_id rather than looking up commitPhillip Wood
2020-11-04rebase -i: stop overwriting ORIG_HEAD bufferPhillip Wood
2020-11-03merge,rebase,revert: select ort or recursive by config or environmentElijah Newren
2020-10-20Documentation: stylistically normalize references to Signed-off-by:Bradley M. Kuhn
2020-09-25Merge branch 'ds/maintenance-part-1'Junio C Hamano
2020-09-17maintenance: replace run_auto_gc()Derrick Stolee
2020-09-03Merge branch 'pw/rebase-i-more-options'Junio C Hamano
2020-08-19rebase: add --reset-author-dateRohit Ashiwal
2020-08-19rebase -i: support --ignore-datePhillip Wood
2020-08-17rebase -i: support --committer-date-is-author-datePhillip Wood
2020-07-31strvec: rename struct fieldsJeff King
2020-07-28strvec: fix indentation in renamed callsJeff King
2020-07-28strvec: convert builtin/ callers away from argv_array nameJeff King
2020-07-28strvec: rename files from argv-array to strvecJeff King