diff options
author | Junio C Hamano <gitster@pobox.com> | 2013-02-05 16:13:32 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2013-02-05 16:13:32 -0800 |
commit | e34c7e2b51c02a761a034b877b852dc0dbccf101 (patch) | |
tree | 2c80451e27d6fda5c0745270fee17da9e7bc2d1e /Documentation/git-branch.txt | |
parent | 6d81ce0543c2fb7177c08491ba31a69aa54b7930 (diff) | |
parent | afeef30c34116ddc4a091d497f5ac8f4cdde7c65 (diff) | |
download | git-e34c7e2b51c02a761a034b877b852dc0dbccf101.tar.gz |
Merge branch 'ta/doc-no-small-caps'
Update documentation to change "GIT" which was a poor-man's small
caps to "Git". The latter was the intended spelling.
Also change "git" spelled in all-lowercase to "Git" when it refers
to the system as the whole or the concept it embodies, as opposed to
the command the end users would type.
* ta/doc-no-small-caps:
Documentation: StGit is the right spelling, not StGIT
Documentation: describe the "repository" in repository-layout
Documentation: add a description for 'gitfile' to glossary
Documentation: do not use undefined terms git-dir and git-file
Documentation: the name of the system is 'Git', not 'git'
Documentation: avoid poor-man's small caps GIT
Diffstat (limited to 'Documentation/git-branch.txt')
-rw-r--r-- | Documentation/git-branch.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/git-branch.txt b/Documentation/git-branch.txt index 45a225e0aa..d4a9be22e6 100644 --- a/Documentation/git-branch.txt +++ b/Documentation/git-branch.txt @@ -45,7 +45,7 @@ Note that this will create the new branch, but it will not switch the working tree to it; use "git checkout <newbranch>" to switch to the new branch. -When a local branch is started off a remote-tracking branch, git sets up the +When a local branch is started off a remote-tracking branch, Git sets up the branch so that 'git pull' will appropriately merge from the remote-tracking branch. This behavior may be changed via the global `branch.autosetupmerge` configuration flag. That setting can be |