From: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Date: Thu, 25 Apr 2019 09:45:57 +0000 (+0700)
Subject: user-manual.txt: prefer 'merge --abort' over 'reset --hard'
X-Git-Tag: v2.23.0-rc0~64^2~6
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/fc991b43df83ee32a92b9d906e77276e5dbd639c?ds=inline;hp=fc991b43df83ee32a92b9d906e77276e5dbd639c

user-manual.txt: prefer 'merge --abort' over 'reset --hard'

Since the operation in progress is merge, stick to the 'git merge'
variant of aborting. 'git reset --hard' does not really tell you about
aborting the merge by just looking, longer to type, and even though I
know by heart what --hard do, I still dislike it when I need to consider
whether --hard, --mixed or --soft.

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---