summaryrefslogtreecommitdiffstats
path: root/sequencer.c
AgeCommit message (Expand)AuthorLines
2023-11-02Merge branch 'ob/sequencer-remove-dead-code' into maint-2.42Junio C Hamano-4/+0
2023-11-02Merge branch 'ob/sequencer-reword-error-message' into maint-2.42Junio C Hamano-1/+1
2023-11-02Merge branch 'pw/rebase-i-after-failure' into maint-2.42Junio C Hamano-83/+99
2023-11-02Merge branch 'ob/sequencer-empty-hint-fix' into maint-2.42Junio C Hamano-1/+1
2023-11-02Merge branch 'mp/rebase-label-length-limit' into maint-2.42Junio C Hamano-6/+41
2023-09-12sequencer: remove unreachable exit condition in pick_commits()Oswald Buddenhagen-4/+0
2023-09-06rebase -i: fix adding failed command to the todo listPhillip Wood-6/+6
2023-09-06rebase --continue: refuse to commit after failed commandPhillip Wood-0/+5
2023-09-06rebase: fix rewritten list for failed pickPhillip Wood-12/+7
2023-09-06sequencer: factor out part of pick_commits()Phillip Wood-61/+71
2023-09-06sequencer: use rebase_path_message()Phillip Wood-5/+2
2023-09-06rebase -i: remove patch file after conflict resolutionPhillip Wood-4/+12
2023-09-06rebase -i: move unlink() callsPhillip Wood-3/+4
2023-09-05sequencer: fix error message on failure to copy SQUASH_MSGOswald Buddenhagen-1/+1
2023-08-24sequencer: rectify empty hint in call of require_clean_work_tree()Oswald Buddenhagen-1/+1
2023-08-10rebase: allow overriding the maximal length of the generated labelsJohannes Schindelin-2/+6
2023-08-10sequencer: truncate labels to accommodate loose refsMark Ruvald Pedersen-5/+36
2023-08-09Merge branch 'pw/rebase-skip-commit-message-fix'Junio C Hamano-7/+19
2023-08-03rebase --skip: fix commit message clean up when skipping squashPhillip Wood-7/+19
2023-08-02Merge branch 'ah/sequencer-rewrite-todo-fix'Junio C Hamano-1/+1
2023-07-24sequencer: finish parsing the todo list despite an invalid first lineAlex Henrie-1/+1
2023-07-17Merge branch 'cw/compat-util-header-cleanup'Junio C Hamano-2/+0
2023-07-06Merge branch 'gc/config-context'Junio C Hamano-13/+16
2023-07-06Merge branch 'cw/strbuf-cleanup'Junio C Hamano-9/+15
2023-07-05git-compat-util: move alloc macros to git-compat-util.hCalvin Wan-1/+0
2023-07-05treewide: remove unnecessary includes for wrapper.hCalvin Wan-1/+0
2023-06-28config: pass kvi to die_bad_number()Glen Choo-11/+11
2023-06-28config: add ctx arg to config_fn_tGlen Choo-3/+6
2023-06-21object-store-ll.h: split this header out of object-store.hElijah Newren-1/+1
2023-06-21repository: remove unnecessary include of path.hElijah Newren-0/+1
2023-06-21cache.h: remove this no-longer-used headerElijah Newren-1/+1
2023-06-21merge.h: move declarations for merge.c from cache.hElijah Newren-0/+1
2023-06-21sparse-index.h: move declarations for sparse-index.c from cache.hElijah Newren-0/+1
2023-06-12strbuf: remove global variableCalvin Wan-9/+15
2023-05-20Merge branch 'js/rebase-count-fixes'Junio C Hamano-5/+8
2023-05-14rebase -r: fix the total number shown in the progressJohannes Schindelin-3/+6
2023-05-14rebase --update-refs: fix loopsJohannes Schindelin-2/+2
2023-05-09Merge branch 'ob/messages-capitalize-exception'Junio C Hamano-2/+2
2023-05-09Merge branch 'ob/sequencer-i18n-fix'Junio C Hamano-1/+1
2023-05-09Merge branch 'en/header-split-cache-h-part-2'Junio C Hamano-0/+1
2023-04-28messages: capitalization and punctuation exceptionsOswald Buddenhagen-2/+2
2023-04-28sequencer: actually translate report in do_exec()Oswald Buddenhagen-1/+1
2023-04-25Merge branch 'en/header-split-cache-h'Junio C Hamano-0/+4
2023-04-24copy.h: move declarations for copy.c functions from cache.hElijah Newren-0/+1
2023-04-17Merge branch 'pw/rebase-cleanup-merge-strategy-option-handling'Junio C Hamano-32/+26
2023-04-11pager.h: move declarations for pager.c functions from cache.hElijah Newren-0/+1
2023-04-11object-file.h: move declarations for object-file.c functions from cache.hElijah Newren-0/+1
2023-04-11object-name.h: move declarations for object-name.c functions from cache.hElijah Newren-0/+1
2023-04-11treewide: be explicit about dependence on advice.hElijah Newren-0/+1
2023-04-10rebase -m: fix serialization of strategy optionsPhillip Wood-5/+6