summaryrefslogtreecommitdiff
path: root/sequencer.c
Commit message (Expand)AuthorAgeFilesLines
* 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
| * | | | hook.[ch]: move find_hook() from run-command.c to hook.cÆvar Arnfjörð Bjarmason2021-09-271-0/+1
* | | | | Merge branch 'en/removing-untracked-fixes'Junio C Hamano2021-10-131-0/+1
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Remove ignored files by default when they are in the wayElijah Newren2021-09-271-2/+1
| * | | | unpack-trees: introduce preserve_ignored to unpack_trees_optionsElijah Newren2021-09-271-0/+2
* | | | | Merge branch 'pw/rebase-reread-todo-after-editing'Junio C Hamano2021-10-061-20/+27
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | rebase: fix todo-list rereadingPhillip Wood2021-09-241-11/+8
| * | | | sequencer.c: factor out a functionPhillip Wood2021-09-241-14/+24
| | |/ / | |/| |
* | | | Merge branch 'ds/mergies-with-sparse-index'Junio C Hamano2021-09-201-0/+9
|\ \ \ \ | |_|/ / |/| | |
| * | | sequencer: ensure full index if not ORT strategyDerrick Stolee2021-09-091-0/+9
| |/ /
* | | Merge branch 'ab/retire-advice-config'Junio C Hamano2021-09-101-4/+4
|\ \ \
| * | | advice: remove read uses of most global `advice_` variablesBen Boeckel2021-08-251-4/+4
| |/ /
* | | Merge branch 'zh/cherry-pick-advice'Junio C Hamano2021-09-101-4/+16
|\ \ \
| * | | cherry-pick: use better advice messageZheNing Hu2021-08-231-4/+16
| |/ /
* | | Merge branch 'js/advise-when-skipping-cherry-picked'Junio C Hamano2021-09-101-2/+20
|\ \ \
| * | | sequencer: advise if skipping cherry-picked commitJosh Steadmon2021-08-301-2/+20
| |/ /
* | | Merge branch 'pw/rebase-r-fixes'Junio C Hamano2021-09-031-49/+57
|\ \ \ | | |/ | |/|
| * | rebase -r: fix merge -c with a merge strategyPhillip Wood2021-08-231-1/+4
| * | rebase -r: don't write .git/MERGE_MSG when fast-forwardingPhillip Wood2021-08-231-40/+41