summaryrefslogtreecommitdiff
path: root/sequencer.c
AgeCommit message (Expand)AuthorFilesLines
2021-10-18Merge branch 'js/retire-preserve-merges'Libravatar Junio C Hamano1-2/+2
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-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
2021-05-07Merge branch 'ab/rebase-no-reschedule-failed-exec'Libravatar Junio C Hamano1-0/+5
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/+5
2021-04-10rebase: don't override --no-reschedule-failed-exec with configLibravatar Ævar Arnfjörð Bjarmason1-0/+5
2021-04-08Merge branch 'en/sequencer-edit-upon-conflict-fix'Libravatar Junio C Hamano1-11/+41
2021-03-31sequencer: fix edit handling for cherry-pick and revert messagesLibravatar Elijah Newren1-11/+41
2021-03-26Merge branch 'cm/rebase-i-fixup-amend-reword'Libravatar Junio C Hamano1-15/+1
2021-03-26Merge branch 'cm/rebase-i-updates'Libravatar Junio C Hamano1-12/+11
2021-03-26Merge branch 'cm/rebase-i'Libravatar Junio C Hamano1-39/+256
2021-03-20merge-ort: write $GIT_DIR/AUTO_MERGE whenever we hit a conflictLibravatar Elijah Newren1-0/+5
2021-03-15sequencer: export and rename subject_length()Libravatar Charvi Mendiratta1-15/+1
2021-03-13use CALLOC_ARRAYLibravatar René Scharfe1-1/+1
2021-02-10Merge branch 'ds/more-index-cleanups'Libravatar Junio C Hamano1-3/+0
2021-02-08sequencer: rename a few functionsLibravatar Charvi Mendiratta1-9/+9
2021-02-08sequencer: fixup the datatype of the 'flag' argumentLibravatar Charvi Mendiratta1-4/+3
2021-01-29rebase -i: teach --autosquash to work with amend!Libravatar Charvi Mendiratta1-7/+16
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-30 12:10:43 +0000