summaryrefslogtreecommitdiff
path: root/sequencer.c
AgeCommit message (Expand)AuthorFilesLines
2024-12-06global: mark code units that generate warnings with `-Wsign-compare`Patrick Steinhardt1-0/+1
2024-12-06Merge branch 'kh/sequencer-comment-char'Junio C Hamano1-10/+16
2024-11-26sequencer: comment commit messages properlyKristoffer Haugsbakk1-4/+8
2024-11-26sequencer: comment `--reference` subject line properlyKristoffer Haugsbakk1-4/+5
2024-11-26sequencer: comment checked-out branch properlyKristoffer Haugsbakk1-2/+3
2024-11-21refs: allow passing flags when setting up a transactionPatrick Steinhardt1-3/+3
2024-10-09rebase-merges: try and use branch names as labelsNicolas Guichard1-8/+17
2024-10-09rebase-update-refs: extract load_branch_decorationsNicolas Guichard1-10/+1
2024-08-28Merge branch 'mt/rebase-x-quiet'Junio C Hamano1-3/+4
2024-08-23Merge branch 'ps/config-wo-the-repository'Junio C Hamano1-3/+3
2024-08-21rebase --exec: respect --quietMatheus Tavares1-3/+4
2024-08-14sequencer: release todo list on error pathsPatrick Steinhardt1-19/+47
2024-08-14builtin/rebase: fix leaking `commit.gpgsign` valuePatrick Steinhardt1-0/+1
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-30/+40
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-14/+27
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