Skip to content

Commit 4ed995e

Browse files
authored
Merge pull request #1860 from petk/patch-git
Capitalize Git
2 parents dcb0cbd + ecb17c6 commit 4ed995e

File tree

10 files changed

+15
-15
lines changed

10 files changed

+15
-15
lines changed

TRANSLATING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ Pro Git is a book about a technical tool, therefore translating it is difficult
88

99
The following are guidelines to help you on your way:
1010
* Before you begin, read the whole Git Pro book in English, so that you're aware of the content, and are familiar with the style used.
11-
* Ensure you have a good working knowledge of git, so that explaining the technical terms is doable.
11+
* Ensure you have a good working knowledge of Git, so that explaining the technical terms is doable.
1212
* Stick to a common style and format for the translation.
1313
* Be sure to read and understand the basics of [Asciidoc formatting](https://docs.asciidoctor.org/asciidoc/latest/syntax-quick-reference/). Not following the asciidoc syntax can lead to problems with building/compilation of the pdf, epub and html files needed for the book.
1414

book/02-git-basics/sections/remotes.asc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -129,10 +129,10 @@ Running `git pull` generally fetches data from the server you originally cloned
129129

130130
[NOTE]
131131
====
132-
From git version 2.27 onward, `git pull` will give a warning if the `pull.rebase` variable is not set.
132+
From Git version 2.27 onward, `git pull` will give a warning if the `pull.rebase` variable is not set.
133133
Git will keep warning you until you set the variable.
134134
135-
If you want the default behavior of git (fast-forward if possible, else create a merge commit):
135+
If you want the default behavior of Git (fast-forward if possible, else create a merge commit):
136136
`git config --global pull.rebase "false"`
137137
138138
If you want to rebase when pulling:

book/09-git-and-other-scms/sections/import-bzr.asc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ $ git init git-repo
9898
$ cd git-repo
9999
----
100100

101-
Pull the `master` branch into git:
101+
Pull the `master` branch into Git:
102102

103103
[source,console]
104104
----

book/10-git-internals/sections/refs.asc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ The answer is the HEAD file.
7373
Usually the HEAD file is a symbolic reference to the branch you're currently on.
7474
By symbolic reference, we mean that unlike a normal reference, it contains a pointer to another reference.
7575

76-
However in some rare cases the HEAD file may contain the SHA-1 value of a git object.
76+
However in some rare cases the HEAD file may contain the SHA-1 value of a Git object.
7777
This happens when you checkout a tag, commit, or remote branch, which puts your repository in https://git-scm.com/docs/git-checkout#_detached_head["detached HEAD"^] state.
7878

7979
If you look at the file, you'll normally see something like this:

book/A-git-in-other-environments/sections/jetbrainsides.asc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,5 @@ It provides a dedicated view in the IDE to work with Git and GitHub Pull Request
66
.Version Control ToolWindow in JetBrains IDEs
77
image::images/jb.png[Version Control ToolWindow in JetBrains IDEs]
88

9-
The integration relies on the command-line git client, and requires one to be installed.
9+
The integration relies on the command-line Git client, and requires one to be installed.
1010
The official documentation is available at https://www.jetbrains.com/help/idea/using-git-integration.html[^].

book/A-git-in-other-environments/sections/powershell.asc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ This happens, because the modules that ship with Windows PowerShell are signed w
5757

5858
===== Update PowerShell Prompt
5959

60-
To include git information in your prompt, the posh-git module needs to be imported.
60+
To include Git information in your prompt, the posh-git module needs to be imported.
6161
To have posh-git imported every time PowerShell starts, execute the `Add-PoshGitToProfile` command which will add the import statement into your `$profile` script.
6262
This script is executed everytime you open a new PowerShell console.
6363
Keep in mind, that there are multiple `$profile` scripts.

book/A-git-in-other-environments/sections/sublimetext.asc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
=== Git in Sublime Text
22

3-
From version 3.2 onwards, Sublime Text has git integration in the editor.
3+
From version 3.2 onwards, Sublime Text has Git integration in the editor.
44

55
The features are:
66

77
* The sidebar will show the git status of files and folders with a badge/icon.
88
* Files and folders that are in your .gitignore file will be faded out in the sidebar.
9-
* In the status bar, you can see the current git branch and how many modifications you have made.
9+
* In the status bar, you can see the current Git branch and how many modifications you have made.
1010
* All changes to a file are now visible via markers in the gutter.
11-
* You can use part of the Sublime Merge git client functionality from within Sublime Text.
11+
* You can use part of the Sublime Merge Git client functionality from within Sublime Text.
1212
This requires that Sublime Merge is installed.
1313
See: https://www.sublimemerge.com/[^].
1414

book/A-git-in-other-environments/sections/visualstudiocode.asc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
=== Git in Visual Studio Code
22

3-
Visual Studio Code has git support built in.
4-
You will need to have git version 2.0.0 (or newer) installed.
3+
Visual Studio Code has Git support built in.
4+
You will need to have Git version 2.0.0 (or newer) installed.
55

66
The main features are:
77

book/A-git-in-other-environments/sections/zsh.asc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ Instead of `vcs_info`, you might prefer the prompt customization script that shi
4747

4848
Zsh is powerful enough that there are entire frameworks dedicated to making it better.
4949
One of them is called "oh-my-zsh", and it can be found at https://github.com/ohmyzsh/ohmyzsh[^].
50-
oh-my-zsh's plugin system comes with powerful git tab-completion, and it has a variety of prompt "themes", many of which display version-control data.
50+
oh-my-zsh's plugin system comes with powerful Git tab-completion, and it has a variety of prompt "themes", many of which display version-control data.
5151
<<oh_my_zsh_git>> is just one example of what can be done with this system.
5252

5353
[[oh_my_zsh_git]]

book/B-embedding-git/sections/dulwich.asc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
(((Dulwich)))(((Python)))
44
There is also a pure-Python Git implementation - Dulwich.
55
The project is hosted under https://www.dulwich.io/[^].
6-
It aims to provide an interface to git repositories (both local and remote) that doesn't call out to git directly but instead uses pure Python.
6+
It aims to provide an interface to Git repositories (both local and remote) that doesn't call out to Git directly but instead uses pure Python.
77
It has an optional C extensions though, that significantly improve the performance.
88

9-
Dulwich follows git design and separate two basic levels of API: plumbing and porcelain.
9+
Dulwich follows Git design and separate two basic levels of API: plumbing and porcelain.
1010

1111
Here is an example of using the lower level API to access the commit message of the last commit:
1212

0 commit comments

Comments
 (0)