summaryrefslogtreecommitdiff
path: root/sequencer.c
Commit message (Expand)AuthorAgeFilesLines
* rebase --update-refs: avoid unintended ref deletionVictoria Dye2022-12-091-3/+6
* Merge branch 'jk/sequencer-missing-author-name-check' into maint-2.38Junio C Hamano2022-10-251-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' into maint-2.38Junio C Hamano2022-10-251-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
* | | | sequencer: add update-ref commandDerrick Stolee2022-07-191-1/+13
* | | | sequencer: define array with enum valuesDerrick Stolee2022-07-191-14/+14
* | | | branch: consider refs under 'update-refs'Derrick Stolee2022-07-191-0/+74
* | | | Merge branch 'jc/revert-show-parent-info'Junio C Hamano2022-06-151-5/+28
|\ \ \ \
| * | | | revert: --reference should apply only to 'revert', not 'cherry-pick'Junio C Hamano2022-05-311-1/+1
| * | | | revert: optionally refer to commit in the "reference" formatJunio C Hamano2022-05-261-5/+28
| |/ / /
* | | | Merge branch 'ab/env-array'Junio C Hamano2022-06-101-9/+9
|\ \ \ \
| * | | | run-command API users: use "env" not "env_array" in comments & namesÆvar Arnfjörð Bjarmason2022-06-021-3/+3
| * | | | run-command API: rename "env_array" to "env"Ævar Arnfjörð Bjarmason2022-06-021-8/+8
* | | | | Merge branch 'ab/plug-leak-in-revisions'Junio C Hamano2022-06-071-7/+19
|\ \ \ \ \
| * | | | | revisions API users: add "goto cleanup" for release_revisions()Ævar Arnfjörð Bjarmason2022-04-131-7/+16
| * | | | | revisions API users: add straightforward release_revisions()Ævar Arnfjörð Bjarmason2022-04-131-0/+3
| |/ / / /
* | | | | Merge branch 'rs/commit-summary-wo-break-rewrite'Junio C Hamano2022-05-111-1/+0
|\ \ \ \ \ | |_|/ / / |/| | / / | | |/ / | |/| |
| * | | commit, sequencer: turn off break_opt for commit summaryRené Scharfe2022-04-061-1/+0
| | |/ | |/|
* | | Revert "Merge branch 'ps/avoid-unnecessary-hook-invocation-with-packed-refs'"Junio C Hamano2022-04-131-1/+1
| |/ |/|
* | Merge branch 'js/in-place-reverse-in-sequencer'Junio C Hamano2022-03-231-6/+4
|\ \
| * | sequencer: use reverse_commit_list() helperJayati Shrivastava2022-03-161-6/+4
| |/
| * Merge branch 'en/keep-cwd' into maintJunio C Hamano2022-01-281-1/+4
| |\
* | | hooks: fix an obscure TOCTOU "did we just run a hook?" raceÆvar Arnfjörð Bjarmason2022-03-071-2/+2
* | | Merge branch 'ja/i18n-common-messages'Junio C Hamano2022-02-251-1/+1
|\ \ \
| * | | i18n: factorize "invalid value" messagesJean-Noël Avila2022-02-041-1/+1
* | | | Merge branch 'ps/avoid-unnecessary-hook-invocation-with-packed-refs'Junio C Hamano2022-02-181-1/+1
|\ \ \ \
| * | | | refs: allow passing flags when beginning transactionsPatrick Steinhardt2022-01-171-1/+1
| | |/ / | |/| |
* | | | Merge branch 'pw/use-in-process-checkout-in-rebase'Junio C Hamano2022-02-181-38/+14
|\ \ \ \
| * | | | rebase -m: don't fork git checkoutPhillip Wood2022-01-261-27/+11
| * | | | reset_head(): take struct rebase_head_optsPhillip Wood2022-01-261-3/+2
| * | | | create_autostash(): remove unneeded parameterPhillip Wood2022-01-261-3/+2
| * | | | reset_head(): remove action parameterPhillip Wood2022-01-261-2/+1
* | | | | Merge branch 'ab/no-errno-from-resolve-ref-unsafe'Junio C Hamano2022-02-111-7/+3
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | refs API: remove "failure_errno" from refs_resolve_ref_unsafe()Ævar Arnfjörð Bjarmason2022-01-261-3/+1
| * | | | sequencer: don't use die_errno() on refs_resolve_ref_unsafe() failureÆvar Arnfjörð Bjarmason2022-01-261-6/+4
| | |/ / | |/| |
* | | | Merge branch 'en/keep-cwd'Junio C Hamano2022-01-261-1/+4
|\ \ \ \ | |/ / / |/| | / | | |/ | |/|