X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=Documentation%2Fmerge-config.txt;h=897329bbd9f01fa0dcc308a3e3e17a576006cace;hb=2de9b71138171dca7279db3b3fe67e868c76d921;hp=9bb4956ccdbef507ab115ac19dfe8ad326afb7c2;hpb=48a8c26c625a4d3631c4f614bceb38933e741408;p=thirdparty%2Fgit.git

diff --git a/Documentation/merge-config.txt b/Documentation/merge-config.txt
index 9bb4956ccd..897329bbd9 100644
--- a/Documentation/merge-config.txt
+++ b/Documentation/merge-config.txt
@@ -17,10 +17,10 @@ merge.defaultToUpstream::
 	these tracking branches are merged.
 
 merge.ff::
-	By default, git does not create an extra merge commit when merging
+	By default, Git does not create an extra merge commit when merging
 	a commit that is a descendant of the current commit. Instead, the
 	tip of the current branch is fast-forwarded. When set to `false`,
-	this variable tells git to create an extra merge commit in such
+	this variable tells Git to create an extra merge commit in such
 	a case (equivalent to giving the `--no-ff` option from the command
 	line). When set to `only`, only such fast-forward merges are
 	allowed (equivalent to giving the `--ff-only` option from the
@@ -38,10 +38,10 @@ merge.renameLimit::
 	diff.renameLimit.
 
 merge.renormalize::
-	Tell git that canonical representation of files in the
+	Tell Git that canonical representation of files in the
 	repository has changed over time (e.g. earlier commits record
 	text files with CRLF line endings, but recent ones use LF line
-	endings).  In such a repository, git can convert the data
+	endings).  In such a repository, Git can convert the data
 	recorded in commits to a canonical form before performing a
 	merge to reduce unnecessary conflicts.  For more information,
 	see section "Merging branches with differing checkin/checkout