summaryrefslogtreecommitdiff
path: root/builtin/rebase.c
AgeCommit message (Expand)Author
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
2020-07-13rebase -i: add --ignore-whitespace flagRohit Ashiwal
2020-05-13Merge branch 'jc/auto-gc-quiet'Junio C Hamano
2020-05-07auto-gc: pass --quiet down from am, commit, merge and rebaseJunio C Hamano
2020-05-05Merge branch 'dl/opt-callback-cleanup'Junio C Hamano
2020-05-01Merge branch 'en/rebase-root-and-fork-point-are-incompatible'Junio C Hamano
2020-04-29Merge branch 'dl/merge-autostash-rebase-quit-fix'Junio C Hamano
2020-04-29Merge branch 'dl/merge-autostash'Junio C Hamano
2020-04-28rebase: save autostash entry into stash reflog on --quitDenton Liu
2020-04-28Use OPT_CALLBACK and OPT_CALLBACK_FDenton Liu
2020-04-27rebase: display an error if --root and --fork-point are both providedElijah Newren
2020-04-22Merge branch 'jt/rebase-allow-duplicate'Junio C Hamano
2020-04-22Merge branch 'en/rebase-no-keep-empty'Junio C Hamano
2020-04-22Merge branch 'dd/no-gpg-sign'Junio C Hamano
2020-04-11rebase --merge: optionally skip upstreamed commitsJonathan Tan
2020-04-11rebase: fix an incompatible-options error messageElijah Newren
2020-04-11rebase: reinstate --no-keep-emptyElijah Newren
2020-04-10merge: teach --autostash optionDenton Liu
2020-04-10sequencer: extract perform_autostash() from rebaseDenton Liu
2020-04-10rebase: generify create_autostash()Denton Liu
2020-04-10rebase: extract create_autostash()Denton Liu
2020-04-10reset: extract reset_head() from rebaseDenton Liu
2020-04-10rebase: generify reset_head()Denton Liu