aboutsummaryrefslogtreecommitdiffstats
path: root/sequencer.c (follow)
Commit message (Expand)AuthorAgeFilesLines
* 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
|\ \ \ \ | |/ / / |/| | / | | |/ | |/|
| * | sequencer, stash: fix running from worktree subdirElijah Newren2022-01-261-1/+4
* | | Merge branch 'en/keep-cwd'Junio C Hamano2022-01-051-0/+2
|\| |
| * | rebase: do not attempt to remove startup_info->original_cwdElijah Newren2021-12-091-0/+2
* | | Merge branch 'en/rebase-x-wo-git-dir-env'Junio C Hamano2021-12-211-8/+1
|\ \ \
| * | | sequencer: do not export GIT_DIR and GIT_WORK_TREE for 'exec'Elijah Newren2021-12-041-8/+1
| |/ /
* | | Merge branch 'ab/run-command'Junio C Hamano2021-12-151-7/+3
|\ \ \
| * | | run-command API users: use strvec_pushl(), not argv constructionÆvar Arnfjörð Bjarmason2021-11-251-7/+3
| |/ /
* | | Merge branch 'en/rebase-x-fix'Junio C Hamano2021-12-101-1/+1
|\ \ \ | |_|/ |/| |
| * | sequencer: avoid adding exec commands for non-commit creating commandsElijah Newren2021-11-291-1/+1
| |/
* | Merge branch 'ab/refs-errno-cleanup'Junio C Hamano2021-11-291-2/+8
|\ \ | |/ |/|
| * refs API: post-migration API renaming [2/2]Ævar Arnfjörð Bjarmason2021-10-161-1/+1
| * refs API: make resolve_ref_unsafe() not set errnoÆvar Arnfjörð Bjarmason2021-10-161-2/+8
* | Merge branch 'pw/rebase-r-fixes'Junio C Hamano2021-11-031-1/+3
|\ \
| * | rebase -i: fix rewording with --committer-date-is-author-datePhillip Wood2021-11-031-1/+3
* | | Merge branch 'ab/unpack-trees-leakfix'Junio C Hamano2021-10-251-21/+15
|\ \ \
| * | | sequencer: fix a memory leak in do_reset()Ævar Arnfjörð Bjarmason2021-10-131-2/+2
| * | | sequencer: add a "goto cleanup" to do_reset()Ævar Arnfjörð Bjarmason2021-10-131-19/+13
* | | | Merge branch 'js/retire-preserve-merges'Junio C Hamano2021-10-181-2/+2
|\ \ \ \ | |_|_|/ |/| | |
| * | | sequencer: restrict scope of a formerly public functionJohannes Schindelin2021-09-071-2/+2
* | | | Merge branch 'ab/config-based-hooks-1'Junio C Hamano2021-10-131-1/+2
|\ \ \ \
| * | | | hook.c users: use "hook_exists()" instead of "find_hook()"Ævar Arnfjörð Bjarmason2021-09-271-1/+1