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/merge-config.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/merge-config.txt')
| -rw-r--r-- | Documentation/merge-config.txt | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Documentation/merge-config.txt b/Documentation/merge-config.txt index 9bb4956cc..897329bbd 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 |