From 2de9b71138171dca7279db3b3fe67e868c76d921 Mon Sep 17 00:00:00 2001
From: Thomas Ackermann
Date: Mon, 21 Jan 2013 20:17:53 +0100
Subject: Documentation: the name of the system is 'Git', not 'git'
Signed-off-by: Thomas Ackermann
Signed-off-by: Junio C Hamano
---
Documentation/git-merge-index.txt | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
(limited to 'Documentation/git-merge-index.txt')
diff --git a/Documentation/git-merge-index.txt b/Documentation/git-merge-index.txt
index e0df1b3340..0c80cec0e8 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 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.
--
cgit v1.2.1