summaryrefslogtreecommitdiffstats
path: root/sequencer.c (follow)
Commit message (Expand)AuthorAgeFilesLines
* Always check `parse_tree*()`'s return valueJohannes Schindelin2024-02-231-0/+4
* Merge branch 'ob/sequencer-remove-dead-code'Junio C Hamano2023-09-201-4/+0
|\
| * sequencer: remove unreachable exit condition in pick_commits()Oswald Buddenhagen2023-09-131-4/+0
* | Merge branch 'pw/rebase-i-after-failure'Junio C Hamano2023-09-141-83/+99
|\ \
| * | rebase -i: fix adding failed command to the todo listPhillip Wood2023-09-061-6/+6
| * | rebase --continue: refuse to commit after failed commandPhillip Wood2023-09-061-0/+5
| * | rebase: fix rewritten list for failed pickPhillip Wood2023-09-061-12/+7
| * | sequencer: factor out part of pick_commits()Phillip Wood2023-09-061-61/+71
| * | sequencer: use rebase_path_message()Phillip Wood2023-09-061-5/+2
| * | rebase -i: remove patch file after conflict resolutionPhillip Wood2023-09-061-4/+12
| * | rebase -i: move unlink() callsPhillip Wood2023-09-061-3/+4
* | | Merge branch 'ob/revert-of-revert-is-reapply'Junio C Hamano2023-09-141-0/+11
|\ \ \
| * | | sequencer: beautify subject of reverts of revertsOswald Buddenhagen2023-09-031-0/+11
| | |/ | |/|
* | | Merge branch 'ob/sequencer-reword-error-message'Junio C Hamano2023-09-131-1/+1
|\ \ \
| * | | sequencer: fix error message on failure to copy SQUASH_MSGOswald Buddenhagen2023-09-061-1/+1
| |/ /
* | | Merge branch 'jk/unused-post-2.42'Junio C Hamano2023-09-081-13/+14
|\ \ \
| * | | sequencer: mark repository argument as unusedJeff King2023-08-301-1/+1
| * | | sequencer: use repository parameter in short_commit_name()Jeff King2023-08-301-12/+13
* | | | Merge branch 'ob/sequencer-empty-hint-fix'Junio C Hamano2023-08-311-1/+1
|\ \ \ \ | |/ / / |/| | |
| * | | sequencer: rectify empty hint in call of require_clean_work_tree()Oswald Buddenhagen2023-08-241-1/+1
* | | | Merge branch 'mp/rebase-label-length-limit'Junio C Hamano2023-08-241-6/+41
|\ \ \ \
| * | | | rebase: allow overriding the maximal length of the generated labelsJohannes Schindelin2023-08-101-2/+6
| * | | | sequencer: truncate labels to accommodate loose refsMark Ruvald Pedersen2023-08-101-5/+36
| |/ / /
* | | | Merge branch 'ob/sequencer-rearrange-cleanup'Junio C Hamano2023-08-241-4/+5
|\ \ \ \ | |_|/ / |/| | |
| * | | sequencer: simplify allocation of result array in todo_list_rearrange_squash()Oswald Buddenhagen2023-08-091-4/+5
* | | | Merge branch 'pw/rebase-skip-commit-message-fix'Junio C Hamano2023-08-101-7/+19
|\ \ \ \ | |/ / / |/| | |
| * | | rebase --skip: fix commit message clean up when skipping squashPhillip Wood2023-08-031-7/+19
| |/ /
* | | Merge branch 'ah/sequencer-rewrite-todo-fix'Junio C Hamano2023-08-021-1/+1
|\ \ \
| * | | sequencer: finish parsing the todo list despite an invalid first lineAlex Henrie2023-07-241-1/+1
* | | | Merge branch 'cw/compat-util-header-cleanup'Junio C Hamano2023-07-171-2/+0
|\ \ \ \
| * | | | git-compat-util: move alloc macros to git-compat-util.hCalvin Wan2023-07-051-1/+0
| * | | | treewide: remove unnecessary includes for wrapper.hCalvin Wan2023-07-051-1/+0
* | | | | Merge branch 'gc/config-context'Junio C Hamano2023-07-061-13/+16
|\ \ \ \ \
| * | | | | config: pass kvi to die_bad_number()Glen Choo2023-06-281-11/+11
| * | | | | config: add ctx arg to config_fn_tGlen Choo2023-06-281-3/+6
| | |_|/ / | |/| | |
* | | | | Merge branch 'cw/strbuf-cleanup'Junio C Hamano2023-07-061-9/+15
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | strbuf: remove global variableCalvin Wan2023-06-121-9/+15
| |/ / /
* | | | object-store-ll.h: split this header out of object-store.hElijah Newren2023-06-211-1/+1
* | | | repository: remove unnecessary include of path.hElijah Newren2023-06-211-0/+1
* | | | cache.h: remove this no-longer-used headerElijah Newren2023-06-211-1/+1
* | | | merge.h: move declarations for merge.c from cache.hElijah Newren2023-06-211-0/+1
* | | | sparse-index.h: move declarations for sparse-index.c from cache.hElijah Newren2023-06-211-0/+1
|/ / /
* | | Merge branch 'js/rebase-count-fixes'Junio C Hamano2023-05-191-5/+8
|\ \ \
| * | | rebase -r: fix the total number shown in the progressJohannes Schindelin2023-05-151-3/+6
| * | | rebase --update-refs: fix loopsJohannes Schindelin2023-05-151-2/+2
| * | | rebase --update-refs: avoid unintended ref deletionVictoria Dye2022-12-091-3/+6
| * | | Merge branch 'jk/sequencer-missing-author-name-check' into maint-2.38Junio C Hamano2022-10-261-1/+1
| |\ \ \
| * \ \ \ Merge branch 'ja/rebase-i-avoid-amending-self' into maint-2.38Junio C Hamano2022-10-261-2/+2
| |\ \ \ \
* | \ \ \ \ Merge branch 'ob/messages-capitalize-exception'Junio C Hamano2023-05-101-2/+2
|\ \ \ \ \ \
| * | | | | | messages: capitalization and punctuation exceptionsOswald Buddenhagen2023-04-281-2/+2