summaryrefslogtreecommitdiff
path: root/git-gui/git-gui.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2022-02-18 13:53:27 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2022-02-18 13:53:27 -0800
commitbcd020f88e1e22f38422ac3f73ab06b34ec4bef1 (patch)
tree8d4f05578a57b57868c9b0168de87c66cf871c81 /git-gui/git-gui.sh
parentMerge branch 'cb/clear-quarantine-early-on-all-ref-update-errors' (diff)
parentrebase -m: don't fork git checkout (diff)
downloadtgif-bcd020f88e1e22f38422ac3f73ab06b34ec4bef1.tar.xz
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 'git-gui/git-gui.sh')
0 files changed, 0 insertions, 0 deletions