summaryrefslogtreecommitdiff
path: root/sequencer.c
AgeCommit message (Expand)AuthorFilesLines
2022-01-05Merge branch 'en/keep-cwd'Libravatar Junio C Hamano1-0/+2
2021-12-21Merge branch 'en/rebase-x-wo-git-dir-env'Libravatar Junio C Hamano1-8/+1
2021-12-15Merge branch 'ab/run-command'Libravatar Junio C Hamano1-7/+3
2021-12-10Merge branch 'en/rebase-x-fix'Libravatar Junio C Hamano1-1/+1
2021-12-09rebase: do not attempt to remove startup_info->original_cwdLibravatar Elijah Newren1-0/+2
2021-12-04sequencer: do not export GIT_DIR and GIT_WORK_TREE for 'exec'Libravatar Elijah Newren1-8/+1
2021-11-29sequencer: avoid adding exec commands for non-commit creating commandsLibravatar Elijah Newren1-1/+1
2021-11-29Merge branch 'ab/refs-errno-cleanup'Libravatar Junio C Hamano1-2/+8
2021-11-25run-command API users: use strvec_pushl(), not argv constructionLibravatar Ævar Arnfjörð Bjarmason1-7/+3
2021-11-03Merge branch 'pw/rebase-r-fixes'Libravatar Junio C Hamano1-1/+3
2021-11-03rebase -i: fix rewording with --committer-date-is-author-dateLibravatar Phillip Wood1-1/+3
2021-10-25Merge branch 'ab/unpack-trees-leakfix'Libravatar Junio C Hamano1-21/+15
2021-10-18Merge branch 'js/retire-preserve-merges'Libravatar Junio C Hamano1-2/+2
2021-10-16refs API: post-migration API renaming [2/2]Libravatar Ævar Arnfjörð Bjarmason1-1/+1
2021-10-16refs API: make resolve_ref_unsafe() not set errnoLibravatar Ævar Arnfjörð Bjarmason1-2/+8
2021-10-13Merge branch 'ab/config-based-hooks-1'Libravatar Junio C Hamano1-1/+2
2021-10-13Merge branch 'en/removing-untracked-fixes'Libravatar Junio C Hamano1-0/+1
2021-10-13sequencer: fix a memory leak in do_reset()Libravatar Ævar Arnfjörð Bjarmason1-2/+2
2021-10-13sequencer: add a "goto cleanup" to do_reset()Libravatar Ævar Arnfjörð Bjarmason1-19/+13
2021-10-06Merge branch 'pw/rebase-reread-todo-after-editing'Libravatar Junio C Hamano1-20/+27
2021-09-27Remove ignored files by default when they are in the wayLibravatar Elijah Newren1-2/+1
2021-09-27unpack-trees: introduce preserve_ignored to unpack_trees_optionsLibravatar Elijah Newren1-0/+2
2021-09-27hook.c users: use "hook_exists()" instead of "find_hook()"Libravatar Ævar Arnfjörð Bjarmason1-1/+1
2021-09-27hook.[ch]: move find_hook() from run-command.c to hook.cLibravatar Ævar Arnfjörð Bjarmason1-0/+1
2021-09-24rebase: fix todo-list rereadingLibravatar Phillip Wood1-11/+8
2021-09-24sequencer.c: factor out a functionLibravatar Phillip Wood1-14/+24
2021-09-20Merge branch 'ds/mergies-with-sparse-index'Libravatar Junio C Hamano1-0/+9
2021-09-10Merge branch 'ab/retire-advice-config'Libravatar Junio C Hamano1-4/+4
2021-09-10Merge branch 'zh/cherry-pick-advice'Libravatar Junio C Hamano1-4/+16
2021-09-10Merge branch 'js/advise-when-skipping-cherry-picked'Libravatar Junio C Hamano1-2/+20
2021-09-09sequencer: ensure full index if not ORT strategyLibravatar Derrick Stolee1-0/+9
2021-09-07sequencer: restrict scope of a formerly public functionLibravatar Johannes Schindelin1-2/+2
2021-09-03Merge branch 'pw/rebase-r-fixes'Libravatar Junio C Hamano1-49/+57
2021-09-03Merge branch 'pw/rebase-skip-final-fix'Libravatar Junio C Hamano1-0/+3
2021-08-30sequencer: advise if skipping cherry-picked commitLibravatar Josh Steadmon1-2/+20
2021-08-30Merge branch 'en/ort-becomes-the-default'Libravatar Junio C Hamano1-2/+2
2021-08-30Merge branch 'en/merge-strategy-docs'Libravatar Junio C Hamano1-1/+1
2021-08-25advice: remove read uses of most global `advice_` variablesLibravatar Ben Boeckel1-4/+4
2021-08-24Merge branch 'js/expand-runtime-prefix'Libravatar Junio C Hamano1-1/+1
2021-08-23cherry-pick: use better advice messageLibravatar ZheNing Hu1-4/+16
2021-08-23rebase -r: fix merge -c with a merge strategyLibravatar Phillip Wood1-1/+4
2021-08-23rebase -r: don't write .git/MERGE_MSG when fast-forwardingLibravatar Phillip Wood1-40/+41
2021-08-20rebase -r: make 'merge -c' behave like rewordLibravatar Phillip Wood1-10/+14
2021-08-13rebase --continue: remove .git/MERGE_MSGLibravatar Phillip Wood1-0/+3
2021-08-05Change default merge backend from recursive to ortLibravatar Elijah Newren1-2/+2
2021-08-05Update error message and code commentLibravatar Elijah Newren1-1/+1
2021-07-26Use a better name for the function interpolating pathsLibravatar Johannes Schindelin1-1/+1
2021-07-13*.c static functions: add missing __attribute__((format))Libravatar Ævar Arnfjörð Bjarmason1-0/+2
2021-07-12sequencer.c: move static function to avoid forward declLibravatar Ævar Arnfjörð Bjarmason1-22/+19
2021-05-10Merge branch 'bc/hash-transition-interop-part-1'Libravatar Junio C Hamano1-2/+2