summaryrefslogtreecommitdiff
path: root/sequencer.c
AgeCommit message (Expand)Author
2022-01-05Merge branch 'en/keep-cwd'Junio C Hamano
2021-12-21Merge branch 'en/rebase-x-wo-git-dir-env'Junio C Hamano
2021-12-15Merge branch 'ab/run-command'Junio C Hamano
2021-12-10Merge branch 'en/rebase-x-fix'Junio C Hamano
2021-12-09rebase: do not attempt to remove startup_info->original_cwdElijah Newren
2021-12-05sequencer: do not export GIT_DIR and GIT_WORK_TREE for 'exec'Elijah Newren
2021-11-30sequencer: avoid adding exec commands for non-commit creating commandsElijah Newren
2021-11-29Merge branch 'ab/refs-errno-cleanup'Junio C Hamano
2021-11-26run-command API users: use strvec_pushl(), not argv constructionÆvar Arnfjörð Bjarmason
2021-11-03Merge branch 'pw/rebase-r-fixes'Junio C Hamano
2021-11-03rebase -i: fix rewording with --committer-date-is-author-datePhillip Wood
2021-10-25Merge branch 'ab/unpack-trees-leakfix'Junio C Hamano
2021-10-18Merge branch 'js/retire-preserve-merges'Junio C Hamano
2021-10-16refs API: post-migration API renaming [2/2]Ævar Arnfjörð Bjarmason
2021-10-16refs API: make resolve_ref_unsafe() not set errnoÆvar Arnfjörð Bjarmason
2021-10-13Merge branch 'ab/config-based-hooks-1'Junio C Hamano
2021-10-13Merge branch 'en/removing-untracked-fixes'Junio C Hamano
2021-10-13sequencer: fix a memory leak in do_reset()Ævar Arnfjörð Bjarmason
2021-10-13sequencer: add a "goto cleanup" to do_reset()Ævar Arnfjörð Bjarmason
2021-10-06Merge branch 'pw/rebase-reread-todo-after-editing'Junio C Hamano
2021-09-27Remove ignored files by default when they are in the wayElijah Newren
2021-09-27unpack-trees: introduce preserve_ignored to unpack_trees_optionsElijah Newren
2021-09-27hook.c users: use "hook_exists()" instead of "find_hook()"Ævar Arnfjörð Bjarmason
2021-09-27hook.[ch]: move find_hook() from run-command.c to hook.cÆvar Arnfjörð Bjarmason
2021-09-24rebase: fix todo-list rereadingPhillip Wood
2021-09-24sequencer.c: factor out a functionPhillip Wood
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-08sequencer: restrict scope of a formerly public functionJohannes Schindelin
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