From: Nguyễn Thái Ngọc Duy Date: Tue, 14 May 2019 09:13:20 GMT Subject: [PATCH v3 0/2] nd/merge-quit updates Message-ID: <20190514091322.12427-1-pclouds@gmail.com> In-Reply-To: <20190509101028.24656-1-pclouds@gmail.com> v3 fixes the test breakage when GPG tests are skipped ('side' branch is affected by these skipped tests) 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 v2: 1: 324d237f0c ! 1: 86dd0fd99c merge: add --quit @@ -13,7 +13,6 @@ different UI). Signed-off-by: Nguyễn Thái Ngọc Duy - Signed-off-by: Junio C Hamano diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt --- a/Documentation/git-merge.txt @@ -76,7 +75,7 @@ ' +test_expect_success 'merge --quit' ' -+ git reset --hard side && ++ git reset --hard c2 && + test_must_fail git -c rerere.enabled=true merge master && + test_path_is_file .git/MERGE_HEAD && + test_path_is_file .git/MERGE_MODE && -- 2.21.0.1141.gd54ac2cb17