Files
git/builtin
Nguyễn Thái Ngọc Duy f3f8311ec7 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>
2019-05-19 10:47:40 +09:00
..
2019-02-06 22:05:23 -08:00
2019-02-06 22:05:23 -08:00
2019-02-06 22:05:24 -08:00
2019-02-06 22:05:23 -08:00
2019-02-06 22:05:23 -08:00
2019-01-29 12:47:54 -08:00
2019-02-06 22:05:28 -08:00
2019-02-06 22:05:23 -08:00
2019-02-06 22:05:23 -08:00
2019-02-06 22:05:23 -08:00
2019-01-29 12:47:54 -08:00
2019-02-06 22:05:23 -08:00
2019-02-06 22:05:23 -08:00
2019-02-06 22:05:23 -08:00
2019-05-19 10:47:40 +09:00
2019-02-06 22:05:28 -08:00
2019-01-18 13:49:52 -08:00
2019-01-04 13:33:33 -08:00