summaryrefslogtreecommitdiffstats
path: root/sequencer.c (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'mt/rebase-x-quiet'Junio C Hamano2024-08-281-3/+4
|\
| * rebase --exec: respect --quietMatheus Tavares2024-08-211-3/+4
* | Merge branch 'ps/config-wo-the-repository'Junio C Hamano2024-08-231-3/+3
|\ \
| * | hooks: remove implicit dependency on `the_repository`Patrick Steinhardt2024-08-131-3/+3
| |/
* | sequencer: release todo list on error pathsPatrick Steinhardt2024-08-141-19/+47
* | builtin/rebase: fix leaking `commit.gpgsign` valuePatrick Steinhardt2024-08-141-0/+1
|/
* merge-recursive: honor diff.algorithmAntonin Delpeuch2024-07-141-2/+2
* Merge branch 'ps/leakfixes-more'Junio C Hamano2024-07-081-38/+78
|\
| * merge: fix leaking merge basesPatrick Steinhardt2024-06-111-0/+1
| * sequencer: fix memory leaks in `make_script_with_merges()`Patrick Steinhardt2024-06-111-0/+3
| * sequencer: fix leaking string buffer in `commit_staged_changes()`Patrick Steinhardt2024-06-111-38/+73
| * commit: fix leaking parents when calling `commit_tree_extended()`Patrick Steinhardt2024-06-111-0/+1
| * Merge branch 'ps/leakfixes' into ps/leakfixes-moreJunio C Hamano2024-06-031-1/+1
| |\
* | \ Merge branch 'ps/use-the-repository'Junio C Hamano2024-07-021-3/+5
|\ \ \
| * | | global: introduce `USE_THE_REPOSITORY_VARIABLE` macroPatrick Steinhardt2024-06-141-0/+2
| * | | hash: require hash algorithm in `empty_tree_oid_hex()`Patrick Steinhardt2024-06-141-1/+1
| * | | hash: require hash algorithm in `oidread()` and `oidclr()`Patrick Steinhardt2024-06-141-2/+2
* | | | Merge branch 'pw/rebase-i-error-message'Junio C Hamano2024-06-211-11/+72
|\ \ \ \ | |/ / / |/| | |
| * | | rebase -i: improve error message when picking mergePhillip Wood2024-05-301-2/+61
| * | | rebase -i: pass struct replay_opts to parse_insn_line()Phillip Wood2024-05-301-10/+12
* | | | Merge branch 'ps/leakfixes'Junio C Hamano2024-06-061-1/+1
|\ \ \ \ | |_|/ / |/| | / | | |/ | |/|
| * | config: clarify memory ownership in `git_config_string()`Patrick Steinhardt2024-05-271-1/+1
* | | Merge branch 'la/hide-trailer-info'Junio C Hamano2024-05-231-15/+12
|\ \ \ | |/ / |/| |
| * | sequencer: use the trailer iteratorLinus Arver2024-05-021-15/+12
* | | Merge branch 'kn/ref-transaction-symref'Junio C Hamano2024-05-201-5/+6
|\ \ \
| * | | refs: accept symref values in `ref_transaction_update()`Karthik Nayak2024-05-071-4/+5
| | |/ | |/|
* | | cocci: apply rules to rewrite callers of "refs" interfacesPatrick Steinhardt2024-05-071-28/+33
* | | Merge branch 'pw/rebase-m-signoff-fix'Junio C Hamano2024-04-301-92/+158
|\ \ \ | |/ / |/| |
| * | rebase -m: fix --signoff with conflictsPhillip Wood2024-04-181-6/+17
| * | sequencer: store commit message in private contextPhillip Wood2024-04-181-46/+50
| * | sequencer: move current fixups to private contextPhillip Wood2024-04-181-32/+57
| * | sequencer: start removing private fields from public APIPhillip Wood2024-04-181-6/+30
| * | sequencer: always free "struct replay_opts"Phillip Wood2024-04-181-2/+4
* | | Merge branch 'jk/core-comment-string'Junio C Hamano2024-04-051-23/+25
|\ \ \
| * | | sequencer: handle multi-byte comment characters when writing todo listJeff King2024-03-121-1/+3
| * | | find multi-byte comment chars in unterminated buffersJeff King2024-03-121-2/+2
| * | | find multi-byte comment chars in NUL-terminated stringsJeff King2024-03-121-1/+1
| * | | prefer comment_line_str to comment_line_char for printingJeff King2024-03-121-10/+10
| * | | strbuf: accept a comment string for strbuf_add_commented_lines()Jeff King2024-03-121-4/+4
| * | | strbuf: accept a comment string for strbuf_commented_addf()Jeff King2024-03-121-2/+2
| * | | strbuf: accept a comment string for strbuf_stripspace()Jeff King2024-03-121-3/+3
| |/ /
* | | Merge branch 'rs/config-comment'Junio C Hamano2024-04-051-15/+15
|\ \ \
| * | | 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
|\ \ \ \ | |/ / / |/| | |
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-18 14:17:11 +0100