summaryrefslogtreecommitdiffstats
path: root/sequencer.c (follow)
AgeCommit message (Expand)AuthorFilesLines
2024-02-14Merge branch 'vn/rebase-with-cherry-pick-authorship'Junio C Hamano1-0/+1
2024-02-08sequencer: unset GIT_CHERRY_PICK_HELP for 'exec' commandsVegard Nossum1-0/+1
2024-01-19sequencer: introduce functions to handle autostashes via refsPatrick Steinhardt1-5/+61
2024-01-19refs: convert AUTO_MERGE to become a normal pseudo-refPatrick Steinhardt1-4/+8
2024-01-19sequencer: delete REBASE_HEAD in correct repo when picking commitsPatrick Steinhardt1-1/+2
2024-01-19sequencer: clean up pseudo refs with REF_NO_DEREFPatrick Steinhardt1-7/+7
2024-01-08Merge branch 'en/header-cleanup'Junio C Hamano1-3/+0
2024-01-02Merge branch 'la/trailer-cleanups'Junio C Hamano1-1/+1
2023-12-26treewide: remove unnecessary includes in source filesElijah Newren1-3/+0
2023-12-20trailer: use offsets for trailer_start/trailer_endLinus Arver1-1/+1
2023-12-09sequencer: simplify away extra git_config_string() callJeff King1-13/+8
2023-09-20Merge branch 'ob/sequencer-remove-dead-code'Junio C Hamano1-4/+0
2023-09-14Merge branch 'pw/rebase-i-after-failure'Junio C Hamano1-83/+99
2023-09-14Merge branch 'ob/revert-of-revert-is-reapply'Junio C Hamano1-0/+11
2023-09-13Merge branch 'ob/sequencer-reword-error-message'Junio C Hamano1-1/+1
2023-09-12sequencer: remove unreachable exit condition in pick_commits()Oswald Buddenhagen1-4/+0
2023-09-07Merge branch 'jk/unused-post-2.42'Junio C Hamano1-13/+14
2023-09-06rebase -i: fix adding failed command to the todo listPhillip Wood1-6/+6
2023-09-06rebase --continue: refuse to commit after failed commandPhillip Wood1-0/+5
2023-09-06rebase: fix rewritten list for failed pickPhillip Wood1-12/+7
2023-09-06sequencer: factor out part of pick_commits()Phillip Wood1-61/+71
2023-09-06sequencer: use rebase_path_message()Phillip Wood1-5/+2
2023-09-06rebase -i: remove patch file after conflict resolutionPhillip Wood1-4/+12
2023-09-06rebase -i: move unlink() callsPhillip Wood1-3/+4
2023-09-05sequencer: fix error message on failure to copy SQUASH_MSGOswald Buddenhagen1-1/+1
2023-09-02sequencer: beautify subject of reverts of revertsOswald Buddenhagen1-0/+11
2023-08-31Merge branch 'ob/sequencer-empty-hint-fix'Junio C Hamano1-1/+1
2023-08-29sequencer: mark repository argument as unusedJeff King1-1/+1
2023-08-29sequencer: use repository parameter in short_commit_name()Jeff King1-12/+13
2023-08-24Merge branch 'mp/rebase-label-length-limit'Junio C Hamano1-6/+41
2023-08-24Merge branch 'ob/sequencer-rearrange-cleanup'Junio C Hamano1-4/+5
2023-08-24sequencer: rectify empty hint in call of require_clean_work_tree()Oswald Buddenhagen1-1/+1
2023-08-10rebase: allow overriding the maximal length of the generated labelsJohannes Schindelin1-2/+6
2023-08-10sequencer: truncate labels to accommodate loose refsMark Ruvald Pedersen1-5/+36
2023-08-09Merge branch 'pw/rebase-skip-commit-message-fix'Junio C Hamano1-7/+19
2023-08-09sequencer: simplify allocation of result array in todo_list_rearrange_squash()Oswald Buddenhagen1-4/+5
2023-08-03rebase --skip: fix commit message clean up when skipping squashPhillip Wood1-7/+19
2023-08-02Merge branch 'ah/sequencer-rewrite-todo-fix'Junio C Hamano1-1/+1
2023-07-24sequencer: finish parsing the todo list despite an invalid first lineAlex Henrie1-1/+1
2023-07-17Merge branch 'cw/compat-util-header-cleanup'Junio C Hamano1-2/+0
2023-07-06Merge branch 'gc/config-context'Junio C Hamano1-13/+16
2023-07-06Merge branch 'cw/strbuf-cleanup'Junio C Hamano1-9/+15
2023-07-05git-compat-util: move alloc macros to git-compat-util.hCalvin Wan1-1/+0
2023-07-05treewide: remove unnecessary includes for wrapper.hCalvin Wan1-1/+0
2023-06-28config: pass kvi to die_bad_number()Glen Choo1-11/+11
2023-06-28config: add ctx arg to config_fn_tGlen Choo1-3/+6
2023-06-21object-store-ll.h: split this header out of object-store.hElijah Newren1-1/+1
2023-06-21repository: remove unnecessary include of path.hElijah Newren1-0/+1
2023-06-21cache.h: remove this no-longer-used headerElijah Newren1-1/+1
2023-06-21merge.h: move declarations for merge.c from cache.hElijah Newren1-0/+1