Hi Duy On 01/05/2019 14:11, Nguyễn Thái Ngọc Duy wrote: > nd/switch-and-restore suggests 'git merge --quit' to get out of a merge > even though this option is not implemented [1]. It's a soft dependency, no > actual functionality is broken by the lack of --quit, so I'm sending > it separately.
Both patches look good to me Best Wishes Phillip > > [1] > https://public-inbox.org/git/78c7c281-82ec-2ba9-a607-dd2ecba54...@gmail.com/ > > 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(-) >
