summaryrefslogtreecommitdiff
path: root/Documentation/config/core.txt
diff options
context:
space:
mode:
authorLibravatar Phillip Wood <phillip.wood@dunelm.org.uk>2022-01-26 13:05:45 +0000
committerLibravatar Junio C Hamano <gitster@pobox.com>2022-01-26 12:08:53 -0800
commitee464c4e37c7f34c4e5ba2fce35df4149083e5ea (patch)
tree058919373a48b0b47fe84898d422989aa6b2eccd /Documentation/config/core.txt
parentcreate_autostash(): remove unneeded parameter (diff)
downloadtgif-ee464c4e37c7f34c4e5ba2fce35df4149083e5ea.tar.xz
rebase: cleanup reset_head() calls
If ORIG_HEAD is not set by passing RESET_ORIG_HEAD then there is no need to pass anything for reflog_orig_head. In addition to the callers fixed in this commit move_to_original_branch() also passes reflog_orig_head without setting ORIG_HEAD. That caller is mistakenly passing the message it wants to put in the branch reflog which is not currently possible so we delay fixing that caller until we can pass the message as the branch reflog. A later commit will make it a BUG() to pass reflog_orig_head without RESET_ORIG_HEAD, that changes cannot be done here as it needs to wait for move_to_original_branch() to be fixed first. Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/config/core.txt')
0 files changed, 0 insertions, 0 deletions