summaryrefslogtreecommitdiff
path: root/builtin/rebase.c
AgeCommit message (Expand)AuthorFilesLines
2021-08-30Merge branch 'en/ort-becomes-the-default'Libravatar Junio C Hamano1-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
2020-11-04rebase -i: stop overwriting ORIG_HEAD bufferLibravatar Phillip Wood1-5/+5
2020-11-02merge,rebase,revert: select ort or recursive by config or environmentLibravatar Elijah Newren1-1/+12
2020-10-20Documentation: stylistically normalize references to Signed-off-by:Libravatar Bradley M. Kuhn1-1/+1
2020-09-25Merge branch 'ds/maintenance-part-1'Libravatar Junio C Hamano1-2/+2
2020-09-17maintenance: replace run_auto_gc()Libravatar Derrick Stolee1-2/+2
2020-09-03Merge branch 'pw/rebase-i-more-options'Libravatar Junio C Hamano1-11/+36
2020-08-19rebase: add --reset-author-dateLibravatar Rohit Ashiwal1-1/+3
2020-08-19rebase -i: support --ignore-dateLibravatar Phillip Wood1-5/+8
2020-08-17rebase -i: support --committer-date-is-author-dateLibravatar Phillip Wood1-5/+12
2020-07-30strvec: rename struct fieldsLibravatar Jeff King1-8/+8
2020-07-28strvec: fix indentation in renamed callsLibravatar Jeff King1-7/+7
2020-07-28strvec: convert builtin/ callers away from argv_array nameLibravatar Jeff King1-30/+30
2020-07-28strvec: rename files from argv-array to strvecLibravatar Jeff King1-1/+1
2020-07-13rebase -i: add --ignore-whitespace flagLibravatar Rohit Ashiwal1-3/+16
2020-05-13Merge branch 'jc/auto-gc-quiet'Libravatar Junio C Hamano1-2/+1
2020-05-07auto-gc: pass --quiet down from am, commit, merge and rebaseLibravatar Junio C Hamano1-2/+1
2020-05-05Merge branch 'dl/opt-callback-cleanup'Libravatar Junio C Hamano1-10/+10
2020-05-01Merge branch 'en/rebase-root-and-fork-point-are-incompatible'Libravatar Junio C Hamano1-0/+3
2020-04-29Merge branch 'dl/merge-autostash-rebase-quit-fix'Libravatar Junio C Hamano1-0/+1
2020-04-29Merge branch 'dl/merge-autostash'Libravatar Junio C Hamano1-264/+44
2020-04-28rebase: save autostash entry into stash reflog on --quitLibravatar Denton Liu1-0/+1
2020-04-28Use OPT_CALLBACK and OPT_CALLBACK_FLibravatar Denton Liu1-10/+10
2020-04-27rebase: display an error if --root and --fork-point are both providedLibravatar Elijah Newren1-0/+3
2020-04-22Merge branch 'jt/rebase-allow-duplicate'Libravatar Junio C Hamano1-0/+7
2020-04-22Merge branch 'en/rebase-no-keep-empty'Libravatar Junio C Hamano1-7/+10
2020-04-22Merge branch 'dd/no-gpg-sign'Libravatar Junio C Hamano1-3/+4
2020-04-11rebase --merge: optionally skip upstreamed commitsLibravatar Jonathan Tan1-0/+7
2020-04-11rebase: fix an incompatible-options error messageLibravatar Elijah Newren1-1/+1
2020-04-11rebase: reinstate --no-keep-emptyLibravatar Elijah Newren1-6/+9
2020-04-10merge: teach --autostash optionLibravatar Denton Liu1-2/+1
2020-04-10sequencer: extract perform_autostash() from rebaseLibravatar Denton Liu1-49/+0
2020-04-10rebase: generify create_autostash()Libravatar Denton Liu1-16/+16