summaryrefslogtreecommitdiff
path: root/sequencer.c
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'pw/rebase-i-parse-fix'Junio C Hamano2023-02-281-10/+8
|\
| * rebase -i: fix parsing of "fixup -C<commit>"Phillip Wood2023-02-231-4/+2
| * rebase -i: match whole word in is_command()Phillip Wood2023-02-231-6/+6
* | Merge branch 'pw/rebase-i-validate-labels-early'Junio C Hamano2023-02-271-1/+38
|\ \
| * | rebase -i: check labels and refs when parsing todo listPhillip Wood2023-02-211-1/+38
* | | Merge branch 'ab/hook-api-with-stdin'Junio C Hamano2023-02-221-14/+4
|\ \ \ | |/ / |/| |
| * | sequencer: use the new hook API for the simpler "post-rewrite" callEmily Shaffer2023-02-081-14/+4
* | | sequencer.c: always free() the "msgbuf" in do_pick_commit()Ævar Arnfjörð Bjarmason2023-02-061-6/+10
* | | builtin/revert.c: move free-ing of "revs" to replay_opts_release()Ævar Arnfjörð Bjarmason2023-02-061-0/+3
* | | sequencer API users: fix get_replay_opts() leaksÆvar Arnfjörð Bjarmason2023-02-061-3/+1
* | | sequencer.c: split up sequencer_remove_state()Ævar Arnfjörð Bjarmason2023-02-061-9/+14
|/ /
* | rebase: cleanup "--exec" option handlingPhillip Wood2023-01-131-2/+2
* | Merge branch 'sk/remove-duplicate-includes'Junio C Hamano2022-12-261-1/+0
|\ \ | |/
| * git: remove duplicate includesSeija Kijin2022-12-151-1/+0
* | Merge branch 'ab/various-leak-fixes'Junio C Hamano2022-12-141-0/+1
|\ \ | |/ |/|
| * sequencer.c: fix "opts->strategy" leak in read_strategy_opts()Ævar Arnfjörð Bjarmason2022-11-211-0/+1
* | Merge branch 'ab/fewer-the-index-macros'Junio C Hamano2022-11-281-6/+9
|\ \
| * | read-cache API & users: make discard_index() return voidÆvar Arnfjörð Bjarmason2022-11-211-6/+9
* | | Merge branch 'pw/rebase-no-reflog-action'Junio C Hamano2022-11-231-20/+25
|\ \ \ | | |/ | |/|
| * | sequencer: stop exporting GIT_REFLOG_ACTIONPhillip Wood2022-11-091-20/+25
* | | Merge branch 'pw/strict-label-lookups'Junio C Hamano2022-11-231-25/+28
|\ \ \ | |_|/ |/| |
| * | sequencer: tighten label lookupsPhillip Wood2022-11-101-6/+8
| * | sequencer: unify label lookupPhillip Wood2022-11-101-24/+25
* | | Merge branch 'vd/skip-cache-tree-update'Taylor Blau2022-11-181-0/+1
|\ \ \
| * | | rebase: use 'skip_cache_tree_update' optionVictoria Dye2022-11-101-0/+1
| |/ /
* | | Merge branch 'vd/update-refs-delete'Taylor Blau2022-11-181-3/+6
|\ \ \ | |/ / |/| |
| * | rebase --update-refs: avoid unintended ref deletionVictoria Dye2022-11-071-3/+6
| |/
* | Merge branch 'rs/no-more-run-command-v'Taylor Blau2022-11-081-18/+14
|\ \ | |/ |/|
| * replace and remove run_command_v_opt()René Scharfe2022-10-301-2/+4
| * use child_process members "args" and "env" directlyRené Scharfe2022-10-301-15/+10
| * sequencer: simplify building argument list in do_exec()René Scharfe2022-10-301-2/+1
* | Merge branch 'pw/rebase-reflog-fixes'Taylor Blau2022-10-301-0/+5
|\ \ | |/ |/|
| * rebase --merge: fix reflog when continuingPhillip Wood2022-10-171-0/+5
* | Merge branch 'jk/sequencer-missing-author-name-check'Junio C Hamano2022-10-111-1/+1
|\ \
| * | sequencer: detect author name errors in read_author_script()Jeff King2022-10-031-1/+1
* | | Merge branch 'ja/rebase-i-avoid-amending-self'Junio C Hamano2022-10-101-2/+2
|\ \ \
| * | | sequencer: avoid dropping fixup commit that targets self via commit-ishJohannes Altmanninger2022-09-261-2/+2
| * | | Merge branch 'rs/commit-summary-wo-break-rewrite' into maintJunio C Hamano2022-06-081-1/+0
| |\ \ \
* | \ \ \ Merge branch 'ab/unused-annotation'Junio C Hamano2022-09-141-2/+2
|\ \ \ \ \
| * | | | | git-compat-util.h: use "UNUSED", not "UNUSED(var)"Ævar Arnfjörð Bjarmason2022-09-011-2/+2
* | | | | | Merge branch 'jk/unused-annotation'Junio C Hamano2022-09-141-2/+3
|\ \ \ \ \ \ | |/ / / / /
| * | | | | hashmap: mark unused callback parametersJeff King2022-08-191-2/+3
* | | | | | sequencer: do not translate command namesMichael J Gruber2022-08-191-2/+2
* | | | | | sequencer: do not translate parameters to error_resolve_conflict()Michael J Gruber2022-08-191-2/+2
* | | | | | sequencer: do not translate reflog messagesMichael J Gruber2022-08-191-1/+1
|/ / / / /
* | | | | sequencer: notify user of --update-refs activityDerrick Stolee2022-07-191-6/+34
* | | | | sequencer: ignore HEAD ref under --update-refsDerrick Stolee2022-07-191-0/+13
* | | | | sequencer: rewrite update-refs as user edits todo listDerrick Stolee2022-07-191-0/+96
* | | | | rebase: update refs from 'update-ref' commandsDerrick Stolee2022-07-191-3/+117
* | | | | rebase: add --update-refs optionDerrick Stolee2022-07-191-0/+107
View Lorry Controller Status