summaryrefslogtreecommitdiffstats
path: root/sequencer.c (follow)
Commit message (Expand)AuthorAgeLines
* Merge branch 'en/rebase-x-wo-git-dir-env'Junio C Hamano2021-12-21-8/+1
|\
| * sequencer: do not export GIT_DIR and GIT_WORK_TREE for 'exec'Elijah Newren2021-12-04-8/+1
* | Merge branch 'ab/run-command'Junio C Hamano2021-12-15-7/+3
|\ \
| * | run-command API users: use strvec_pushl(), not argv constructionÆvar Arnfjörð Bjarmason2021-11-25-7/+3
| |/
* | Merge branch 'en/rebase-x-fix'Junio C Hamano2021-12-10-1/+1
|\ \
| * | sequencer: avoid adding exec commands for non-commit creating commandsElijah Newren2021-11-29-1/+1
| |/
* | Merge branch 'ab/refs-errno-cleanup'Junio C Hamano2021-11-29-2/+8
|\ \ | |/ |/|
| * refs API: post-migration API renaming [2/2]Ævar Arnfjörð Bjarmason2021-10-16-1/+1
| * refs API: make resolve_ref_unsafe() not set errnoÆvar Arnfjörð Bjarmason2021-10-16-2/+8
* | Merge branch 'pw/rebase-r-fixes'Junio C Hamano2021-11-03-1/+3
|\ \
| * | rebase -i: fix rewording with --committer-date-is-author-datePhillip Wood2021-11-03-1/+3
* | | Merge branch 'ab/unpack-trees-leakfix'Junio C Hamano2021-10-25-21/+15
|\ \ \
| * | | sequencer: fix a memory leak in do_reset()Ævar Arnfjörð Bjarmason2021-10-13-2/+2
| * | | sequencer: add a "goto cleanup" to do_reset()Ævar Arnfjörð Bjarmason2021-10-13-19/+13
* | | | Merge branch 'js/retire-preserve-merges'Junio C Hamano2021-10-18-2/+2
|\ \ \ \ | |_|_|/ |/| | |
| * | | sequencer: restrict scope of a formerly public functionJohannes Schindelin2021-09-07-2/+2
* | | | Merge branch 'ab/config-based-hooks-1'Junio C Hamano2021-10-13-1/+2
|\ \ \ \
| * | | | hook.c users: use "hook_exists()" instead of "find_hook()"Ævar Arnfjörð Bjarmason2021-09-27-1/+1
| * | | | hook.[ch]: move find_hook() from run-command.c to hook.cÆvar Arnfjörð Bjarmason2021-09-27-0/+1
* | | | | Merge branch 'en/removing-untracked-fixes'Junio C Hamano2021-10-13-0/+1
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Remove ignored files by default when they are in the wayElijah Newren2021-09-27-2/+1
| * | | | unpack-trees: introduce preserve_ignored to unpack_trees_optionsElijah Newren2021-09-27-0/+2
* | | | | Merge branch 'pw/rebase-reread-todo-after-editing'Junio C Hamano2021-10-06-20/+27
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | rebase: fix todo-list rereadingPhillip Wood2021-09-24-11/+8
| * | | | sequencer.c: factor out a functionPhillip Wood2021-09-24-14/+24
| | |/ / | |/| |
* | | | Merge branch 'ds/mergies-with-sparse-index'Junio C Hamano2021-09-20-0/+9
|\ \ \ \ | |_|/ / |/| | |
| * | | sequencer: ensure full index if not ORT strategyDerrick Stolee2021-09-09-0/+9
| |/ /
* | | Merge branch 'ab/retire-advice-config'Junio C Hamano2021-09-10-4/+4
|\ \ \
| * | | advice: remove read uses of most global `advice_` variablesBen Boeckel2021-08-25-4/+4
| |/ /
* | | Merge branch 'zh/cherry-pick-advice'Junio C Hamano2021-09-10-4/+16
|\ \ \
| * | | cherry-pick: use better advice messageZheNing Hu2021-08-23-4/+16
| |/ /
* | | Merge branch 'js/advise-when-skipping-cherry-picked'Junio C Hamano2021-09-10-2/+20
|\ \ \
| * | | sequencer: advise if skipping cherry-picked commitJosh Steadmon2021-08-30-2/+20
| |/ /
* | | Merge branch 'pw/rebase-r-fixes'Junio C Hamano2021-09-03-49/+57
|\ \ \ | | |/ | |/|
| * | rebase -r: fix merge -c with a merge strategyPhillip Wood2021-08-23-1/+4
| * | rebase -r: don't write .git/MERGE_MSG when fast-forwardingPhillip Wood2021-08-23-40/+41
| * | rebase -r: make 'merge -c' behave like rewordPhillip Wood2021-08-20-10/+14
| |/
* | Merge branch 'pw/rebase-skip-final-fix'Junio C Hamano2021-09-03-0/+3
|\ \
| * | rebase --continue: remove .git/MERGE_MSGPhillip Wood2021-08-13-0/+3
* | | Merge branch 'en/ort-becomes-the-default'Junio C Hamano2021-08-30-2/+2
|\ \ \
| * | | Change default merge backend from recursive to ortElijah Newren2021-08-05-2/+2
* | | | Merge branch 'en/merge-strategy-docs'Junio C Hamano2021-08-30-1/+1
|\| | |
| * | | Update error message and code commentElijah Newren2021-08-05-1/+1
| | |/ | |/|
* | | Merge branch 'js/expand-runtime-prefix'Junio C Hamano2021-08-24-1/+1
|\ \ \ | |/ / |/| |
| * | Use a better name for the function interpolating pathsJohannes Schindelin2021-07-26-1/+1
| |/
* | *.c static functions: add missing __attribute__((format))Ævar Arnfjörð Bjarmason2021-07-13-0/+2
* | sequencer.c: move static function to avoid forward declÆvar Arnfjörð Bjarmason2021-07-12-22/+19
|/
* Merge branch 'bc/hash-transition-interop-part-1'Junio C Hamano2021-05-10-2/+2
|\
| * hash: provide per-algorithm null OIDsbrian m. carlson2021-04-27-2/+2
* | Merge branch 'ab/rebase-no-reschedule-failed-exec'Junio C Hamano2021-05-07-0/+5
|\ \