summaryrefslogtreecommitdiffstats
path: root/sequencer.c
AgeCommit message (Expand)AuthorLines
2024-04-05Merge branch 'jk/core-comment-string'Junio C Hamano-23/+25
2024-04-05Merge branch 'rs/config-comment'Junio C Hamano-15/+15
2024-04-03Merge branch 'bl/cherry-pick-empty'Junio C Hamano-31/+41
2024-04-01Merge branch 'pb/advice-merge-conflict'Junio C Hamano-15/+18
2024-03-25cherry-pick: add `--empty` for more robust redundant commit handlingBrian Lyles-0/+6
2024-03-25sequencer: do not require `allow_empty` for redundant commit optionsBrian Lyles-16/+7
2024-03-25sequencer: handle unborn branch with `--allow-empty`Brian Lyles-15/+28
2024-03-18Merge branch 'pw/rebase-i-ignore-cherry-pick-help-environment'Junio C Hamano-1/+13
2024-03-18sequencer: allow disabling conflict advicePhilippe Blain-15/+18
2024-03-15config: add --comment option to add a commentRalph Seichter-14/+14
2024-03-14Merge branch 'la/trailer-api'Junio C Hamano-1/+1
2024-03-12sequencer: handle multi-byte comment characters when writing todo listJeff King-1/+3
2024-03-12find multi-byte comment chars in unterminated buffersJeff King-2/+2
2024-03-12find multi-byte comment chars in NUL-terminated stringsJeff King-1/+1
2024-03-12prefer comment_line_str to comment_line_char for printingJeff King-10/+10
2024-03-12strbuf: accept a comment string for strbuf_add_commented_lines()Jeff King-4/+4
2024-03-12strbuf: accept a comment string for strbuf_commented_addf()Jeff King-2/+2
2024-03-12strbuf: accept a comment string for strbuf_stripspace()Jeff King-3/+3
2024-03-11Merge branch 'js/merge-base-with-missing-commit'Junio C Hamano-2/+6
2024-03-07Merge branch 'js/merge-tree-3-trees'Junio C Hamano-0/+4
2024-03-01trailer_info_get(): reorder parametersLinus Arver-1/+1
2024-02-29commit-reach(repo_get_merge_bases): pass on "missing commits" errorsJohannes Schindelin-2/+6
2024-02-27rebase -i: stop setting GIT_CHERRY_PICK_HELPPhillip Wood-1/+13
2024-02-23Always check `parse_tree*()`'s return valueJohannes Schindelin-0/+4
2024-02-14Merge branch 'vn/rebase-with-cherry-pick-authorship'Junio C Hamano-0/+1
2024-02-08sequencer: unset GIT_CHERRY_PICK_HELP for 'exec' commandsVegard Nossum-0/+1
2024-01-19sequencer: introduce functions to handle autostashes via refsPatrick Steinhardt-5/+61
2024-01-19refs: convert AUTO_MERGE to become a normal pseudo-refPatrick Steinhardt-4/+8
2024-01-19sequencer: delete REBASE_HEAD in correct repo when picking commitsPatrick Steinhardt-1/+2
2024-01-19sequencer: clean up pseudo refs with REF_NO_DEREFPatrick Steinhardt-7/+7
2024-01-08Merge branch 'en/header-cleanup'Junio C Hamano-3/+0
2024-01-02Merge branch 'la/trailer-cleanups'Junio C Hamano-1/+1
2023-12-26treewide: remove unnecessary includes in source filesElijah Newren-3/+0
2023-12-20trailer: use offsets for trailer_start/trailer_endLinus Arver-1/+1
2023-12-09sequencer: simplify away extra git_config_string() callJeff King-13/+8
2023-09-20Merge branch 'ob/sequencer-remove-dead-code'Junio C Hamano-4/+0
2023-09-14Merge branch 'pw/rebase-i-after-failure'Junio C Hamano-83/+99
2023-09-14Merge branch 'ob/revert-of-revert-is-reapply'Junio C Hamano-0/+11
2023-09-13Merge branch 'ob/sequencer-reword-error-message'Junio C Hamano-1/+1
2023-09-12sequencer: remove unreachable exit condition in pick_commits()Oswald Buddenhagen-4/+0
2023-09-07Merge branch 'jk/unused-post-2.42'Junio C Hamano-13/+14
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-09-02sequencer: beautify subject of reverts of revertsOswald Buddenhagen-0/+11
generated by cgit v1.2.3 (git 2.46.0) at 2026-04-30 07:58:17 +0000