diff options
| author |  Thomas Ackermann <th.acker@arcor.de> | 2013-01-21 20:17:53 +0100 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2013-02-01 13:53:33 -0800 |
| commit | 2de9b71138171dca7279db3b3fe67e868c76d921 (patch) | |
| tree | 09cc74f510322f4f1241cd11a374490bc32d5aa3 /Documentation/howto/revert-a-faulty-merge.txt | |
| parent | Documentation: avoid poor-man's small caps GIT (diff) | |
| download | tgif-2de9b71138171dca7279db3b3fe67e868c76d921.tar.xz | |
Documentation: the name of the system is 'Git', not 'git'
Signed-off-by: Thomas Ackermann <th.acker@arcor.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/howto/revert-a-faulty-merge.txt')
| -rw-r--r-- | Documentation/howto/revert-a-faulty-merge.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/howto/revert-a-faulty-merge.txt b/Documentation/howto/revert-a-faulty-merge.txt index 8a685483f4..075418eeeb 100644 --- a/Documentation/howto/revert-a-faulty-merge.txt +++ b/Documentation/howto/revert-a-faulty-merge.txt @@ -164,7 +164,7 @@ merged. So it's debugging hell, because now you don't have lots of small changes that you can try to pinpoint which _part_ of it changes. But does it all work? Sure it does. You can revert a merge, and from a -purely technical angle, git did it very naturally and had no real +purely technical angle, Git did it very naturally and had no real troubles. It just considered it a change from "state before merge" to "state after merge", and that was it. Nothing complicated, nothing odd, nothing really dangerous. Git will do it without even thinking about it. |