summaryrefslogtreecommitdiff
path: root/sequencer.c
AgeCommit message (Expand)Author
2021-09-20Merge branch 'ds/mergies-with-sparse-index'Junio C Hamano
2021-09-10Merge branch 'ab/retire-advice-config'Junio C Hamano
2021-09-10Merge branch 'zh/cherry-pick-advice'Junio C Hamano
2021-09-10Merge branch 'js/advise-when-skipping-cherry-picked'Junio C Hamano
2021-09-09sequencer: ensure full index if not ORT strategyDerrick Stolee
2021-09-03Merge branch 'pw/rebase-r-fixes'Junio C Hamano
2021-09-03Merge branch 'pw/rebase-skip-final-fix'Junio C Hamano
2021-08-30sequencer: advise if skipping cherry-picked commitJosh Steadmon
2021-08-30Merge branch 'en/ort-becomes-the-default'Junio C Hamano
2021-08-30Merge branch 'en/merge-strategy-docs'Junio C Hamano
2021-08-25advice: remove read uses of most global `advice_` variablesBen Boeckel
2021-08-24Merge branch 'js/expand-runtime-prefix'Junio C Hamano
2021-08-23cherry-pick: use better advice messageZheNing Hu
2021-08-23rebase -r: fix merge -c with a merge strategyPhillip Wood
2021-08-23rebase -r: don't write .git/MERGE_MSG when fast-forwardingPhillip Wood
2021-08-20rebase -r: make 'merge -c' behave like rewordPhillip Wood
2021-08-13rebase --continue: remove .git/MERGE_MSGPhillip Wood
2021-08-05Change default merge backend from recursive to ortElijah Newren
2021-08-05Update error message and code commentElijah Newren
2021-07-26Use a better name for the function interpolating pathsJohannes Schindelin
2021-07-13*.c static functions: add missing __attribute__((format))Ævar Arnfjörð Bjarmason
2021-07-12sequencer.c: move static function to avoid forward declÆvar Arnfjörð Bjarmason
2021-05-10Merge branch 'bc/hash-transition-interop-part-1'Junio C Hamano
2021-05-07Merge branch 'ab/rebase-no-reschedule-failed-exec'Junio C Hamano
2021-04-27hash: provide per-algorithm null OIDsbrian m. carlson
2021-04-16Merge branch 'en/ort-readiness'Junio C Hamano
2021-04-11rebase: don't override --no-reschedule-failed-exec with configÆvar Arnfjörð Bjarmason
2021-04-08Merge branch 'en/sequencer-edit-upon-conflict-fix'Junio C Hamano
2021-03-31sequencer: fix edit handling for cherry-pick and revert messagesElijah Newren
2021-03-26Merge branch 'cm/rebase-i-fixup-amend-reword'Junio C Hamano
2021-03-26Merge branch 'cm/rebase-i-updates'Junio C Hamano
2021-03-26Merge branch 'cm/rebase-i'Junio C Hamano
2021-03-20merge-ort: write $GIT_DIR/AUTO_MERGE whenever we hit a conflictElijah Newren
2021-03-15sequencer: export and rename subject_length()Charvi Mendiratta
2021-03-14use CALLOC_ARRAYRené Scharfe
2021-02-10Merge branch 'ds/more-index-cleanups'Junio C Hamano
2021-02-08sequencer: rename a few functionsCharvi Mendiratta
2021-02-08sequencer: fixup the datatype of the 'flag' argumentCharvi Mendiratta
2021-01-29rebase -i: teach --autosquash to work with amend!Charvi Mendiratta
2021-01-29rebase -i: add fixup [-C | -c] commandCharvi Mendiratta
2021-01-29sequencer: use const variable for commit message commentsCharvi Mendiratta
2021-01-29sequencer: pass todo_item to do_pick_commit()Charvi Mendiratta
2021-01-29rebase -i: comment out squash!/fixup! subjects from squash messagePhillip Wood
2021-01-28rebase -i: do leave commit message intact in fixup! chainsJohannes Schindelin
2021-01-24cache-tree: clean up cache_tree_update()Derrick Stolee
2021-01-21sequencer: factor out code to append squash messagePhillip Wood
2021-01-21rebase -i: only write fixup-message when it's neededPhillip Wood
2020-11-21Merge branch 'en/strmap'Junio C Hamano
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
generated by cgit v0.10.2-6-g49f6 at 2024-04-26 22:12:38 (GMT)