summaryrefslogtreecommitdiffstats
path: root/sequencer.c (follow)
Commit message (Expand)AuthorAgeFilesLines
...
| * | | config: add --comment option to add a commentRalph Seichter2024-03-151-14/+14
| | |/ | |/|
* | | Merge branch 'bl/cherry-pick-empty'Junio C Hamano2024-04-031-31/+41
|\ \ \
| * | | cherry-pick: add `--empty` for more robust redundant commit handlingBrian Lyles2024-03-261-0/+6
| * | | sequencer: do not require `allow_empty` for redundant commit optionsBrian Lyles2024-03-261-16/+7
| * | | sequencer: handle unborn branch with `--allow-empty`Brian Lyles2024-03-261-15/+28
* | | | Merge branch 'pb/advice-merge-conflict'Junio C Hamano2024-04-011-15/+18
|\ \ \ \
| * | | | sequencer: allow disabling conflict advicePhilippe Blain2024-03-181-15/+18
| | |/ / | |/| |
* | | | Merge branch 'pw/rebase-i-ignore-cherry-pick-help-environment'Junio C Hamano2024-03-181-1/+13
|\ \ \ \ | |/ / / |/| | |
| * | | rebase -i: stop setting GIT_CHERRY_PICK_HELPPhillip Wood2024-02-271-1/+13
| | |/ | |/|
* | | Merge branch 'la/trailer-api'Junio C Hamano2024-03-141-1/+1
|\ \ \
| * | | trailer_info_get(): reorder parametersLinus Arver2024-03-011-1/+1
* | | | Merge branch 'js/merge-base-with-missing-commit'Junio C Hamano2024-03-111-2/+6
|\ \ \ \ | |_|_|/ |/| | |
| * | | commit-reach(repo_get_merge_bases): pass on "missing commits" errorsJohannes Schindelin2024-02-291-2/+6
| | |/ | |/|
* | | Merge branch 'js/merge-tree-3-trees'Junio C Hamano2024-03-081-0/+4
|\ \ \ | |/ / |/| |
| * | Always check `parse_tree*()`'s return valueJohannes Schindelin2024-02-231-0/+4
* | | Merge branch 'vn/rebase-with-cherry-pick-authorship'Junio C Hamano2024-02-151-0/+1
|\ \ \
| * | | sequencer: unset GIT_CHERRY_PICK_HELP for 'exec' commandsVegard Nossum2024-02-081-0/+1
| |/ /
* | | sequencer: introduce functions to handle autostashes via refsPatrick Steinhardt2024-01-191-5/+61
* | | refs: convert AUTO_MERGE to become a normal pseudo-refPatrick Steinhardt2024-01-191-4/+8
* | | sequencer: delete REBASE_HEAD in correct repo when picking commitsPatrick Steinhardt2024-01-191-1/+2
* | | sequencer: clean up pseudo refs with REF_NO_DEREFPatrick Steinhardt2024-01-191-7/+7
| |/ |/|
* | Merge branch 'en/header-cleanup'Junio C Hamano2024-01-081-3/+0
|\ \
| * | treewide: remove unnecessary includes in source filesElijah Newren2023-12-261-3/+0
| |/
* | Merge branch 'la/trailer-cleanups'Junio C Hamano2024-01-021-1/+1
|\ \
| * | trailer: use offsets for trailer_start/trailer_endLinus Arver2023-12-201-1/+1
| |/
* / sequencer: simplify away extra git_config_string() callJeff King2023-12-091-13/+8
|/
* 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
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-29 22:45:06 +0100