projects / git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 75f4c7c) | patch
user-manual.txt: prefer 'merge --abort' over 'reset --hard'
authorNguyễn Thái Ngọc Duy <pclouds@gmail.com>
Thu, 25 Apr 2019 09:45:57 +0000 (16:45 +0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 7 May 2019 04:04:48 +0000 (13:04 +0900)
commitfc991b43df83ee32a92b9d906e77276e5dbd639c
treeeacb936351b45acd890e04aed19ce40b0a6fca04tree | snapshot
parent75f4c7c1eb06cdf6eae1339bbac02dfb620acc11commit | diff
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>
Documentation/user-manual.txt diff | blob | blame | history
Unnamed repository; edit this file 'description' to name the repository.