summaryrefslogtreecommitdiffstats
path: root/sequencer.c
AgeCommit message (Expand)AuthorLines
2021-11-03Merge branch 'pw/rebase-r-fixes'Junio C Hamano-1/+3
2021-11-03rebase -i: fix rewording with --committer-date-is-author-datePhillip Wood-1/+3
2021-10-25Merge branch 'ab/unpack-trees-leakfix'Junio C Hamano-21/+15
2021-10-18Merge branch 'js/retire-preserve-merges'Junio C Hamano-2/+2
2021-10-13Merge branch 'ab/config-based-hooks-1'Junio C Hamano-1/+2
2021-10-13Merge branch 'en/removing-untracked-fixes'Junio C Hamano-0/+1
2021-10-13sequencer: fix a memory leak in do_reset()Ævar Arnfjörð Bjarmason-2/+2
2021-10-13sequencer: add a "goto cleanup" to do_reset()Ævar Arnfjörð Bjarmason-19/+13
2021-10-06Merge branch 'pw/rebase-reread-todo-after-editing'Junio C Hamano-20/+27
2021-09-27Remove ignored files by default when they are in the wayElijah Newren-2/+1
2021-09-27unpack-trees: introduce preserve_ignored to unpack_trees_optionsElijah Newren-0/+2
2021-09-27hook.c users: use "hook_exists()" instead of "find_hook()"Ævar Arnfjörð Bjarmason-1/+1
2021-09-27hook.[ch]: move find_hook() from run-command.c to hook.cÆvar Arnfjörð Bjarmason-0/+1
2021-09-24rebase: fix todo-list rereadingPhillip Wood-11/+8
2021-09-24sequencer.c: factor out a functionPhillip Wood-14/+24
2021-09-20Merge branch 'ds/mergies-with-sparse-index'Junio C Hamano-0/+9
2021-09-10Merge branch 'ab/retire-advice-config'Junio C Hamano-4/+4
2021-09-10Merge branch 'zh/cherry-pick-advice'Junio C Hamano-4/+16
2021-09-10Merge branch 'js/advise-when-skipping-cherry-picked'Junio C Hamano-2/+20
2021-09-09sequencer: ensure full index if not ORT strategyDerrick Stolee-0/+9
2021-09-07sequencer: restrict scope of a formerly public functionJohannes Schindelin-2/+2
2021-09-03Merge branch 'pw/rebase-r-fixes'Junio C Hamano-49/+57
2021-09-03Merge branch 'pw/rebase-skip-final-fix'Junio C Hamano-0/+3
2021-08-30sequencer: advise if skipping cherry-picked commitJosh Steadmon-2/+20
2021-08-30Merge branch 'en/ort-becomes-the-default'Junio C Hamano-2/+2
2021-08-30Merge branch 'en/merge-strategy-docs'Junio C Hamano-1/+1
2021-08-25advice: remove read uses of most global `advice_` variablesBen Boeckel-4/+4
2021-08-24Merge branch 'js/expand-runtime-prefix'Junio C Hamano-1/+1
2021-08-23cherry-pick: use better advice messageZheNing Hu-4/+16
2021-08-23rebase -r: fix merge -c with a merge strategyPhillip Wood-1/+4
2021-08-23rebase -r: don't write .git/MERGE_MSG when fast-forwardingPhillip Wood-40/+41
2021-08-20rebase -r: make 'merge -c' behave like rewordPhillip Wood-10/+14
2021-08-13rebase --continue: remove .git/MERGE_MSGPhillip Wood-0/+3
2021-08-05Change default merge backend from recursive to ortElijah Newren-2/+2
2021-08-05Update error message and code commentElijah Newren-1/+1
2021-07-26Use a better name for the function interpolating pathsJohannes Schindelin-1/+1
2021-07-13*.c static functions: add missing __attribute__((format))Ævar Arnfjörð Bjarmason-0/+2
2021-07-12sequencer.c: move static function to avoid forward declÆvar Arnfjörð Bjarmason-22/+19
2021-05-10Merge branch 'bc/hash-transition-interop-part-1'Junio C Hamano-2/+2
2021-05-07Merge branch 'ab/rebase-no-reschedule-failed-exec'Junio C Hamano-0/+5
2021-04-27hash: provide per-algorithm null OIDsbrian m. carlson-2/+2
2021-04-16Merge branch 'en/ort-readiness'Junio C Hamano-0/+5
2021-04-10rebase: don't override --no-reschedule-failed-exec with configÆvar Arnfjörð Bjarmason-0/+5
2021-04-08Merge branch 'en/sequencer-edit-upon-conflict-fix'Junio C Hamano-11/+41
2021-03-31sequencer: fix edit handling for cherry-pick and revert messagesElijah Newren-11/+41
2021-03-26Merge branch 'cm/rebase-i-fixup-amend-reword'Junio C Hamano-15/+1
2021-03-26Merge branch 'cm/rebase-i-updates'Junio C Hamano-12/+11
2021-03-26Merge branch 'cm/rebase-i'Junio C Hamano-39/+256
2021-03-20merge-ort: write $GIT_DIR/AUTO_MERGE whenever we hit a conflictElijah Newren-0/+5
2021-03-15sequencer: export and rename subject_length()Charvi Mendiratta-15/+1
generated by cgit v1.2.3 (git 2.46.0) at 2026-04-30 11:27:29 +0000