summaryrefslogtreecommitdiff
path: root/ll-merge.h
diff options
context:
space:
mode:
authorLibravatar Johannes Schindelin <johannes.schindelin@gmx.de>2019-01-18 07:09:26 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2019-01-18 10:11:45 -0800
commit414f336069adfaea76217387cd03beefb4d73a20 (patch)
treeb813502c677c63e4b6bab5acbcb6c2179f5a8a0d /ll-merge.h
parentrebase: avoid double reflog entry when switching branches (diff)
downloadtgif-414f336069adfaea76217387cd03beefb4d73a20.tar.xz
rebase: teach `reset_head()` to optionally skip the worktree
This is what the legacy (scripted) rebase does in `move_to_original_branch`, and we will need this functionality in the next commit. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'll-merge.h')
0 files changed, 0 insertions, 0 deletions