diff options
| author |  Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2019-04-25 16:45:57 +0700 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2019-05-07 13:04:48 +0900 |
| commit | fc991b43df83ee32a92b9d906e77276e5dbd639c (patch) | |
| tree | eacb936351b45acd890e04aed19ce40b0a6fca04 /compat/strcasestr.c | |
| parent | completion: support restore (diff) | |
| download | tgif-fc991b43df83ee32a92b9d906e77276e5dbd639c.tar.xz | |
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>
Diffstat (limited to 'compat/strcasestr.c')
0 files changed, 0 insertions, 0 deletions