Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'ps/avoid-unnecessary-hook-invocation-with-packed-refs' | Junio C Hamano | 2022-02-18 | 1 | -1/+1 |
|\ | |||||
| * | refs: allow passing flags when beginning transactions | Patrick Steinhardt | 2022-01-17 | 1 | -1/+1 |
* | | Merge branch 'pw/use-in-process-checkout-in-rebase' | Junio C Hamano | 2022-02-18 | 1 | -38/+14 |
|\ \ | |||||
| * | | rebase -m: don't fork git checkout | Phillip Wood | 2022-01-26 | 1 | -27/+11 |
| * | | reset_head(): take struct rebase_head_opts | Phillip Wood | 2022-01-26 | 1 | -3/+2 |
| * | | create_autostash(): remove unneeded parameter | Phillip Wood | 2022-01-26 | 1 | -3/+2 |
| * | | reset_head(): remove action parameter | Phillip Wood | 2022-01-26 | 1 | -2/+1 |
* | | | Merge branch 'ab/no-errno-from-resolve-ref-unsafe' | Junio C Hamano | 2022-02-11 | 1 | -7/+3 |
|\ \ \ | |||||
| * | | | refs API: remove "failure_errno" from refs_resolve_ref_unsafe() | Ævar Arnfjörð Bjarmason | 2022-01-26 | 1 | -3/+1 |
| * | | | sequencer: don't use die_errno() on refs_resolve_ref_unsafe() failure | Ævar Arnfjörð Bjarmason | 2022-01-26 | 1 | -6/+4 |
| | |/ | |/| | |||||
* | | | Merge branch 'en/keep-cwd' | Junio C Hamano | 2022-01-26 | 1 | -1/+4 |
|\ \ \ | |/ / |/| | | |||||
| * | | sequencer, stash: fix running from worktree subdir | Elijah Newren | 2022-01-26 | 1 | -1/+4 |
* | | | Merge branch 'en/keep-cwd' | Junio C Hamano | 2022-01-05 | 1 | -0/+2 |
|\ \ \ | |/ / | |||||
| * | | rebase: do not attempt to remove startup_info->original_cwd | Elijah Newren | 2021-12-09 | 1 | -0/+2 |
* | | | Merge branch 'en/rebase-x-wo-git-dir-env' | Junio C Hamano | 2021-12-21 | 1 | -8/+1 |
|\ \ \ | |||||
| * | | | sequencer: do not export GIT_DIR and GIT_WORK_TREE for 'exec' | Elijah Newren | 2021-12-04 | 1 | -8/+1 |
| |/ / | |||||
* | | | Merge branch 'ab/run-command' | Junio C Hamano | 2021-12-15 | 1 | -7/+3 |
|\ \ \ | |||||
| * | | | run-command API users: use strvec_pushl(), not argv construction | Ævar Arnfjörð Bjarmason | 2021-11-25 | 1 | -7/+3 |
| |/ / | |||||
* | | | Merge branch 'en/rebase-x-fix' | Junio C Hamano | 2021-12-10 | 1 | -1/+1 |
|\ \ \ | |_|/ |/| | | |||||
| * | | sequencer: avoid adding exec commands for non-commit creating commands | Elijah Newren | 2021-11-29 | 1 | -1/+1 |
| |/ | |||||
* | | Merge branch 'ab/refs-errno-cleanup' | Junio C Hamano | 2021-11-29 | 1 | -2/+8 |
|\ \ | |/ |/| | |||||
| * | refs API: post-migration API renaming [2/2] | Ævar Arnfjörð Bjarmason | 2021-10-16 | 1 | -1/+1 |
| * | refs API: make resolve_ref_unsafe() not set errno | Ævar Arnfjörð Bjarmason | 2021-10-16 | 1 | -2/+8 |
* | | Merge branch 'pw/rebase-r-fixes' | Junio C Hamano | 2021-11-03 | 1 | -1/+3 |
|\ \ | |||||
| * | | rebase -i: fix rewording with --committer-date-is-author-date | Phillip Wood | 2021-11-03 | 1 | -1/+3 |
* | | | Merge branch 'ab/unpack-trees-leakfix' | Junio C Hamano | 2021-10-25 | 1 | -21/+15 |
|\ \ \ | |||||
| * | | | sequencer: fix a memory leak in do_reset() | Ævar Arnfjörð Bjarmason | 2021-10-13 | 1 | -2/+2 |
| * | | | sequencer: add a "goto cleanup" to do_reset() | Ævar Arnfjörð Bjarmason | 2021-10-13 | 1 | -19/+13 |
* | | | | Merge branch 'js/retire-preserve-merges' | Junio C Hamano | 2021-10-18 | 1 | -2/+2 |
|\ \ \ \ | |_|_|/ |/| | | | |||||
| * | | | sequencer: restrict scope of a formerly public function | Johannes Schindelin | 2021-09-07 | 1 | -2/+2 |
* | | | | Merge branch 'ab/config-based-hooks-1' | Junio C Hamano | 2021-10-13 | 1 | -1/+2 |
|\ \ \ \ | |||||
| * | | | | hook.c users: use "hook_exists()" instead of "find_hook()" | Ævar Arnfjörð Bjarmason | 2021-09-27 | 1 | -1/+1 |
| * | | | | hook.[ch]: move find_hook() from run-command.c to hook.c | Ævar Arnfjörð Bjarmason | 2021-09-27 | 1 | -0/+1 |
* | | | | | Merge branch 'en/removing-untracked-fixes' | Junio C Hamano | 2021-10-13 | 1 | -0/+1 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | |||||
| * | | | | Remove ignored files by default when they are in the way | Elijah Newren | 2021-09-27 | 1 | -2/+1 |
| * | | | | unpack-trees: introduce preserve_ignored to unpack_trees_options | Elijah Newren | 2021-09-27 | 1 | -0/+2 |
* | | | | | Merge branch 'pw/rebase-reread-todo-after-editing' | Junio C Hamano | 2021-10-06 | 1 | -20/+27 |
|\ \ \ \ \ | |_|/ / / |/| | | | | |||||
| * | | | | rebase: fix todo-list rereading | Phillip Wood | 2021-09-24 | 1 | -11/+8 |
| * | | | | sequencer.c: factor out a function | Phillip Wood | 2021-09-24 | 1 | -14/+24 |
| | |/ / | |/| | | |||||
* | | | | Merge branch 'ds/mergies-with-sparse-index' | Junio C Hamano | 2021-09-20 | 1 | -0/+9 |
|\ \ \ \ | |_|/ / |/| | | | |||||
| * | | | sequencer: ensure full index if not ORT strategy | Derrick Stolee | 2021-09-09 | 1 | -0/+9 |
| |/ / | |||||
* | | | Merge branch 'ab/retire-advice-config' | Junio C Hamano | 2021-09-10 | 1 | -4/+4 |
|\ \ \ | |||||
| * | | | advice: remove read uses of most global `advice_` variables | Ben Boeckel | 2021-08-25 | 1 | -4/+4 |
| |/ / | |||||
* | | | Merge branch 'zh/cherry-pick-advice' | Junio C Hamano | 2021-09-10 | 1 | -4/+16 |
|\ \ \ | |||||
| * | | | cherry-pick: use better advice message | ZheNing Hu | 2021-08-23 | 1 | -4/+16 |
| |/ / | |||||
* | | | Merge branch 'js/advise-when-skipping-cherry-picked' | Junio C Hamano | 2021-09-10 | 1 | -2/+20 |
|\ \ \ | |||||
| * | | | sequencer: advise if skipping cherry-picked commit | Josh Steadmon | 2021-08-30 | 1 | -2/+20 |
| |/ / | |||||
* | | | Merge branch 'pw/rebase-r-fixes' | Junio C Hamano | 2021-09-03 | 1 | -49/+57 |
|\ \ \ | | |/ | |/| | |||||
| * | | rebase -r: fix merge -c with a merge strategy | Phillip Wood | 2021-08-23 | 1 | -1/+4 |
| * | | rebase -r: don't write .git/MERGE_MSG when fast-forwarding | Phillip Wood | 2021-08-23 | 1 | -40/+41 |