summaryrefslogtreecommitdiff
path: root/.gitmodules
diff options
context:
space:
mode:
authorLibravatar Nguyễn Thái Ngọc Duy <pclouds@gmail.com>2019-05-18 18:30:43 +0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2019-05-19 10:47:40 +0900
commitf3f8311ec76f9bcdc7e26a125e585eb4e473a8d2 (patch)
treecaa84e1112e300a06e7361ed03624e3c8a0f804f /.gitmodules
parentmerge: remove drop_save() in favor of remove_merge_branch_state() (diff)
downloadtgif-f3f8311ec76f9bcdc7e26a125e585eb4e473a8d2.tar.xz
merge: add --quit
This allows to cancel the current merge without resetting worktree/index, which is what --abort is for. Like other --quit(s), this is often used when you forgot that you're in the middle of a merge and already switched away, doing different things. By the time you've realized, you can't even continue the merge anymore. This also makes all in-progress commands, am, merge, rebase, revert and cherry-pick, take all three --abort, --continue and --quit (bisect has a different UI). Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to '.gitmodules')
0 files changed, 0 insertions, 0 deletions