summaryrefslogtreecommitdiff
path: root/sequencer.c
AgeCommit message (Expand)Author
2024-04-30Merge branch 'pw/rebase-m-signoff-fix'Junio C Hamano
2024-04-18rebase -m: fix --signoff with conflictsPhillip Wood
2024-04-18sequencer: store commit message in private contextPhillip Wood
2024-04-18sequencer: move current fixups to private contextPhillip Wood
2024-04-18sequencer: start removing private fields from public APIPhillip Wood
2024-04-18sequencer: always free "struct replay_opts"Phillip Wood
2024-04-05Merge branch 'jk/core-comment-string'Junio C Hamano
2024-04-05Merge branch 'rs/config-comment'Junio C Hamano
2024-04-03Merge branch 'bl/cherry-pick-empty'Junio C Hamano
2024-04-01Merge branch 'pb/advice-merge-conflict'Junio C Hamano
2024-03-25cherry-pick: add `--empty` for more robust redundant commit handlingBrian Lyles
2024-03-25sequencer: do not require `allow_empty` for redundant commit optionsBrian Lyles
2024-03-25sequencer: handle unborn branch with `--allow-empty`Brian Lyles
2024-03-18Merge branch 'pw/rebase-i-ignore-cherry-pick-help-environment'Junio C Hamano
2024-03-18sequencer: allow disabling conflict advicePhilippe Blain
2024-03-15config: add --comment option to add a commentRalph Seichter
2024-03-14Merge branch 'la/trailer-api'Junio C Hamano
2024-03-12sequencer: handle multi-byte comment characters when writing todo listJeff King
2024-03-12find multi-byte comment chars in unterminated buffersJeff King
2024-03-12find multi-byte comment chars in NUL-terminated stringsJeff King
2024-03-12prefer comment_line_str to comment_line_char for printingJeff King
2024-03-12strbuf: accept a comment string for strbuf_add_commented_lines()Jeff King
2024-03-12strbuf: accept a comment string for strbuf_commented_addf()Jeff King
2024-03-12strbuf: accept a comment string for strbuf_stripspace()Jeff King
2024-03-11Merge branch 'js/merge-base-with-missing-commit'Junio C Hamano
2024-03-07Merge branch 'js/merge-tree-3-trees'Junio C Hamano
2024-03-01trailer_info_get(): reorder parametersLinus Arver
2024-02-29commit-reach(repo_get_merge_bases): pass on "missing commits" errorsJohannes Schindelin
2024-02-27rebase -i: stop setting GIT_CHERRY_PICK_HELPPhillip Wood
2024-02-23Always check `parse_tree*()`'s return valueJohannes Schindelin
2024-02-14Merge branch 'vn/rebase-with-cherry-pick-authorship'Junio C Hamano
2024-02-08sequencer: unset GIT_CHERRY_PICK_HELP for 'exec' commandsVegard Nossum
2024-01-19sequencer: introduce functions to handle autostashes via refsPatrick Steinhardt
2024-01-19refs: convert AUTO_MERGE to become a normal pseudo-refPatrick Steinhardt
2024-01-19sequencer: delete REBASE_HEAD in correct repo when picking commitsPatrick Steinhardt
2024-01-19sequencer: clean up pseudo refs with REF_NO_DEREFPatrick Steinhardt
2024-01-08Merge branch 'en/header-cleanup'Junio C Hamano
2024-01-02Merge branch 'la/trailer-cleanups'Junio C Hamano
2023-12-26treewide: remove unnecessary includes in source filesElijah Newren
2023-12-20trailer: use offsets for trailer_start/trailer_endLinus Arver
2023-12-09sequencer: simplify away extra git_config_string() callJeff King
2023-09-20Merge branch 'ob/sequencer-remove-dead-code'Junio C Hamano
2023-09-14Merge branch 'pw/rebase-i-after-failure'Junio C Hamano
2023-09-14Merge branch 'ob/revert-of-revert-is-reapply'Junio C Hamano
2023-09-13Merge branch 'ob/sequencer-reword-error-message'Junio C Hamano
2023-09-12sequencer: remove unreachable exit condition in pick_commits()Oswald Buddenhagen
2023-09-07Merge branch 'jk/unused-post-2.42'Junio C Hamano
2023-09-06rebase -i: fix adding failed command to the todo listPhillip Wood
2023-09-06rebase --continue: refuse to commit after failed commandPhillip Wood
2023-09-06rebase: fix rewritten list for failed pickPhillip Wood