aboutsummaryrefslogtreecommitdiffstats
path: root/sequencer.c (follow)
AgeCommit message (Expand)AuthorFilesLines
2024-08-13hooks: remove implicit dependency on `the_repository`Patrick Steinhardt1-3/+3
2024-07-13merge-recursive: honor diff.algorithmAntonin Delpeuch1-2/+2
2024-07-08Merge branch 'ps/leakfixes-more'Junio C Hamano1-38/+78
2024-07-02Merge branch 'ps/use-the-repository'Junio C Hamano1-3/+5
2024-06-20Merge branch 'pw/rebase-i-error-message'Junio C Hamano1-11/+72
2024-06-14global: introduce `USE_THE_REPOSITORY_VARIABLE` macroPatrick Steinhardt1-0/+2
2024-06-14hash: require hash algorithm in `empty_tree_oid_hex()`Patrick Steinhardt1-1/+1
2024-06-14hash: require hash algorithm in `oidread()` and `oidclr()`Patrick Steinhardt1-2/+2
2024-06-11merge: fix leaking merge basesPatrick Steinhardt1-0/+1
2024-06-11sequencer: fix memory leaks in `make_script_with_merges()`Patrick Steinhardt1-0/+3
2024-06-11sequencer: fix leaking string buffer in `commit_staged_changes()`Patrick Steinhardt1-38/+73
2024-06-11commit: fix leaking parents when calling `commit_tree_extended()`Patrick Steinhardt1-0/+1
2024-06-06Merge branch 'ps/leakfixes'Junio C Hamano1-1/+1
2024-06-03Merge branch 'ps/leakfixes' into ps/leakfixes-moreJunio C Hamano1-1/+1
2024-05-30rebase -i: improve error message when picking mergePhillip Wood1-2/+61
2024-05-30rebase -i: pass struct replay_opts to parse_insn_line()Phillip Wood1-10/+12
2024-05-27config: clarify memory ownership in `git_config_string()`Patrick Steinhardt1-1/+1
2024-05-23Merge branch 'la/hide-trailer-info'Junio C Hamano1-15/+12
2024-05-20Merge branch 'kn/ref-transaction-symref'Junio C Hamano1-5/+6
2024-05-07cocci: apply rules to rewrite callers of "refs" interfacesPatrick Steinhardt1-28/+33
2024-05-07refs: accept symref values in `ref_transaction_update()`Karthik Nayak1-4/+5
2024-05-02sequencer: use the trailer iteratorLinus Arver1-15/+12
2024-04-30Merge branch 'pw/rebase-m-signoff-fix'Junio C Hamano1-92/+158
2024-04-18rebase -m: fix --signoff with conflictsPhillip Wood1-6/+17
2024-04-18sequencer: store commit message in private contextPhillip Wood1-46/+50
2024-04-18sequencer: move current fixups to private contextPhillip Wood1-32/+57
2024-04-18sequencer: start removing private fields from public APIPhillip Wood1-6/+30
2024-04-18sequencer: always free "struct replay_opts"Phillip Wood1-2/+4
2024-04-05Merge branch 'jk/core-comment-string'Junio C Hamano1-23/+25
2024-04-05Merge branch 'rs/config-comment'Junio C Hamano1-15/+15
2024-04-03Merge branch 'bl/cherry-pick-empty'Junio C Hamano1-31/+41
2024-04-01Merge branch 'pb/advice-merge-conflict'Junio C Hamano1-15/+18
2024-03-25cherry-pick: add `--empty` for more robust redundant commit handlingBrian Lyles1-0/+6
2024-03-25sequencer: do not require `allow_empty` for redundant commit optionsBrian Lyles1-16/+7
2024-03-25sequencer: handle unborn branch with `--allow-empty`Brian Lyles1-15/+28
2024-03-18Merge branch 'pw/rebase-i-ignore-cherry-pick-help-environment'Junio C Hamano1-1/+13
2024-03-18sequencer: allow disabling conflict advicePhilippe Blain1-15/+18
2024-03-15config: add --comment option to add a commentRalph Seichter1-14/+14
2024-03-14Merge branch 'la/trailer-api'Junio C Hamano1-1/+1
2024-03-12sequencer: handle multi-byte comment characters when writing todo listJeff King1-1/+3
2024-03-12find multi-byte comment chars in unterminated buffersJeff King1-2/+2
2024-03-12find multi-byte comment chars in NUL-terminated stringsJeff King1-1/+1
2024-03-12prefer comment_line_str to comment_line_char for printingJeff King1-10/+10
2024-03-12strbuf: accept a comment string for strbuf_add_commented_lines()Jeff King1-4/+4
2024-03-12strbuf: accept a comment string for strbuf_commented_addf()Jeff King1-2/+2
2024-03-12strbuf: accept a comment string for strbuf_stripspace()Jeff King1-3/+3
2024-03-11Merge branch 'js/merge-base-with-missing-commit'Junio C Hamano1-2/+6
2024-03-07Merge branch 'js/merge-tree-3-trees'Junio C Hamano1-0/+4
2024-03-01trailer_info_get(): reorder parametersLinus Arver1-1/+1
2024-02-29commit-reach(repo_get_merge_bases): pass on "missing commits" errorsJohannes Schindelin1-2/+6