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/git-merge-index.txt | |
parent | 48a8c26c625a4d3631c4f614bceb38933e741408 (diff) | |
download | git-2de9b71138171dca7279db3b3fe67e868c76d921.tar.gz git-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/git-merge-index.txt')
-rw-r--r-- | Documentation/git-merge-index.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/git-merge-index.txt b/Documentation/git-merge-index.txt index e0df1b334..0c80cec0e 100644 --- a/Documentation/git-merge-index.txt +++ b/Documentation/git-merge-index.txt @@ -41,13 +41,13 @@ If 'git merge-index' is called with multiple <file>s (or -a) then it processes them in turn only stopping if merge returns a non-zero exit code. -Typically this is run with a script calling git's imitation of +Typically this is run with a script calling Git's imitation of the 'merge' command from the RCS package. A sample script called 'git merge-one-file' is included in the distribution. -ALERT ALERT ALERT! The git "merge object order" is different from the +ALERT ALERT ALERT! The Git "merge object order" is different from the RCS 'merge' program merge object order. In the above ordering, the original is first. But the argument order to the 3-way merge program 'merge' is to have the original in the middle. Don't ask me why. |