From: Nguyễn Thái Ngọc Duy Date: Thu, 09 May 2019 10:10:26 GMT Subject: [PATCH v2 0/2] nd/merge-quit update Message-ID: <20190509101028.24656-1-pclouds@gmail.com> In-Reply-To: <20190501131152.314-1-pclouds@gmail.com> A couple typos in the commit message. No code change. Nguyễn Thái Ngọc Duy (2): merge: remove drop_save() in favor of remove_merge_branch_state() merge: add --quit Documentation/git-merge.txt | 4 ++++ branch.c | 11 ++++++++--- branch.h | 6 ++++++ builtin/merge.c | 30 ++++++++++++++++++------------ t/t7600-merge.sh | 14 ++++++++++++++ 5 files changed, 50 insertions(+), 15 deletions(-) Range-diff dựa trên v1: 1: a87e56a43a ! 1: 51710c4c6c merge: add --quit @@ -2,10 +2,10 @@ merge: add --quit - This allows to cancel the current merge without reseting worktree/index, + 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're realize, you + 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 -- 2.21.0.1141.gd54ac2cb17