summaryrefslogtreecommitdiff
path: root/refs.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2022-02-18 13:53:27 -0800
committerJunio C Hamano <gitster@pobox.com>2022-02-18 13:53:27 -0800
commitbcd020f88e1e22f38422ac3f73ab06b34ec4bef1 (patch)
tree8d4f05578a57b57868c9b0168de87c66cf871c81 /refs.c
parent867b520301cc5e719b575edde7736ebe70a19298 (diff)
parent38c541ce94048cf72aa4f465be9314423a57f445 (diff)
downloadgit-bcd020f88e1e22f38422ac3f73ab06b34ec4bef1.tar.gz
Merge branch 'pw/use-in-process-checkout-in-rebase'
Use an internal call to reset_head() helper function instead of spawning "git checkout" in "rebase", and update code paths that are involved in the change. * pw/use-in-process-checkout-in-rebase: rebase -m: don't fork git checkout rebase --apply: set ORIG_HEAD correctly rebase --apply: fix reflog reset_head(): take struct rebase_head_opts rebase: cleanup reset_head() calls create_autostash(): remove unneeded parameter reset_head(): make default_reflog_action optional reset_head(): factor out ref updates reset_head(): remove action parameter rebase --apply: don't run post-checkout hook if there is an error rebase: do not remove untracked files on checkout rebase: pass correct arguments to post-checkout hook t5403: refactor rebase post-checkout hook tests rebase: factor out checkout for up to date branch
Diffstat (limited to 'refs.c')
0 files changed, 0 insertions, 0 deletions