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 /Documentation/user-manual.txt | |
| parent | 75f4c7c1eb06cdf6eae1339bbac02dfb620acc11 (diff) | |
| download | git-fc991b43df83ee32a92b9d906e77276e5dbd639c.tar.gz | |
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/user-manual.txt')
| -rw-r--r-- | Documentation/user-manual.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt index 94799faa2b..4e210970e1 100644 --- a/Documentation/user-manual.txt +++ b/Documentation/user-manual.txt @@ -1408,7 +1408,7 @@ If you get stuck and decide to just give up and throw the whole mess away, you can always return to the pre-merge state with ------------------------------------------------- -$ git reset --hard HEAD +$ git merge --abort ------------------------------------------------- Or, if you've already committed the merge that you want to throw away, |