summaryrefslogtreecommitdiff
path: root/Documentation/git-format-patch.txt
diff options
context:
space:
mode:
authorNguyễn Thái Ngọc Duy <pclouds@gmail.com>2019-04-25 09:45:57 (GMT)
committerJunio C Hamano <gitster@pobox.com>2019-05-07 04:04:48 (GMT)
commitfc991b43df83ee32a92b9d906e77276e5dbd639c (patch)
treeeacb936351b45acd890e04aed19ce40b0a6fca04 /Documentation/git-format-patch.txt
parent75f4c7c1eb06cdf6eae1339bbac02dfb620acc11 (diff)
downloadgit-fc991b43df83ee32a92b9d906e77276e5dbd639c.zip
git-fc991b43df83ee32a92b9d906e77276e5dbd639c.tar.gz
git-fc991b43df83ee32a92b9d906e77276e5dbd639c.tar.bz2
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 'Documentation/git-format-patch.txt')
0 files changed, 0 insertions, 0 deletions