| commit | fc991b43df83ee32a92b9d906e77276e5dbd639c | |
| author | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | |
| Thu, 25 Apr 2019 09:45:57 +0000 (25 16:45 +0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 7 May 2019 04:04:48 +0000 (7 13:04 +0900) | ||
| tree | eacb936351b45acd890e04aed19ce40b0a6fca04 | treesnapshot (tar.gz zip) |
| parent | 75f4c7c1eb06cdf6eae1339bbac02dfb620acc11 | commitdiff |
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>
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 | diffblobblamehistory |