diff --git a/en/01-introduction/01-chapter1.markdown b/en/01-introduction/01-chapter1.markdown index f6917d691..cf8731e02 100644 --- a/en/01-introduction/01-chapter1.markdown +++ b/en/01-introduction/01-chapter1.markdown @@ -163,12 +163,12 @@ Or if you’re on a Debian-based distribution like Ubuntu, try apt-get: There are two easy ways to install Git on a Mac. The easiest is to use the graphical Git installer, which you can download from the Google Code page (see Figure 1-7): -http://code.google.com/p/git-osx-installer + http://code.google.com/p/git-osx-installer Insert 18333fig0107.png Figure 1-7. Git OS X installer -The other major way is to install Git via MacPorts (http://www.macports.org). If you have MacPorts installed, install Git via +The other major way is to install Git via MacPorts (`http://www.macports.org`). If you have MacPorts installed, install Git via $ sudo port install git-core +svn +doc +bash_completion +gitweb @@ -192,7 +192,7 @@ Git comes with a tool called git config that lets you get and set configuration * `~/.gitconfig` file: Specific to your user. You can make Git read and write to this file specifically by passing the `--global` option. * config file in the git directory (that is, `.git/config`) of whatever repository you’re currently using: Specific to that single repository. Each level overrides values in the previous level, so values in `.git/config` trump those in `/etc/gitconfig`. -On Windows systems, Git looks for the `.gitconfig` file in the `$HOME` directory (C:\Documents and Settings\$USER for most people). It also still looks for /etc/gitconfig, although it’s relative to the MSys root, which is wherever you decide to install Git on your Windows system when you run the installer. +On Windows systems, Git looks for the `.gitconfig` file in the `$HOME` directory (`C:\Documents and Settings\$USER` for most people). It also still looks for /etc/gitconfig, although it’s relative to the MSys root, which is wherever you decide to install Git on your Windows system when you run the installer. ### Your Identity ### diff --git a/en/02-git-basics/01-chapter2.markdown b/en/02-git-basics/01-chapter2.markdown index 3d008c74d..2a54fd331 100644 --- a/en/02-git-basics/01-chapter2.markdown +++ b/en/02-git-basics/01-chapter2.markdown @@ -47,7 +47,7 @@ Remember that each file in your working directory can be in one of two states: t As you edit files, Git sees them as modified, because you’ve changed them since your last commit. You stage these modified files and then commit all your staged changes, and the cycle repeats. This lifecycle is illustrated in Figure 2-1. Insert 18333fig0201.png -Fig 2-1. The lifecycle of the status of your files +Figure 2-1. The lifecycle of the status of your files ### Checking the Status of Your Files ### diff --git a/en/07-customizing-git/01-chapter7.markdown b/en/07-customizing-git/01-chapter7.markdown index 8acf5495f..6e2f5e0a5 100644 --- a/en/07-customizing-git/01-chapter7.markdown +++ b/en/07-customizing-git/01-chapter7.markdown @@ -117,7 +117,7 @@ When that value is set, Git colors its output if the output goes to a terminal. You’ll rarely want `color.ui = always`. In most scenarios, if you want color codes in your redirected output, you can instead pass a `--color` flag to the Git command to force it to use color codes. The `color.ui = true` setting is almost always what you’ll want to use. -#### `color.*` #### +#### color.* #### If you want to be more specific about which commands are colored and how, or you have an older version, Git provides verb-specific coloring settings. Each of these can be set to `true`, `false`, or `always`: diff --git a/ja/01-introduction/01-chapter1.markdown b/ja/01-introduction/01-chapter1.markdown index c1a942219..49acb5727 100644 --- a/ja/01-introduction/01-chapter1.markdown +++ b/ja/01-introduction/01-chapter1.markdown @@ -163,12 +163,12 @@ Or if you’re on a Debian-based distribution like Ubuntu, try apt-get: There are two easy ways to install Git on a Mac. The easiest is to use the graphical Git installer, which you can download from the Google Code page (see Figure 1-7): -http://code.google.com/p/git-osx-installer + http://code.google.com/p/git-osx-installer Insert 18333fig0107.png Figure 1-7. Git OS X installer -The other major way is to install Git via MacPorts (http://www.macports.org). If you have MacPorts installed, install Git via +The other major way is to install Git via MacPorts (`http://www.macports.org`). If you have MacPorts installed, install Git via $ sudo port install git-core +svn +doc +bash_completion +gitweb @@ -192,7 +192,7 @@ Git comes with a tool called git config that lets you get and set configuration * `~/.gitconfig` file: Specific to your user. You can make Git read and write to this file specifically by passing the `--global` option. * config file in the git directory (that is, `.git/config`) of whatever repository you’re currently using: Specific to that single repository. Each level overrides values in the previous level, so values in `.git/config` trump those in `/etc/gitconfig`. -On Windows systems, Git looks for the `.gitconfig` file in the `$HOME` directory (C:\Documents and Settings\$USER for most people). It also still looks for /etc/gitconfig, although it’s relative to the MSys root, which is wherever you decide to install Git on your Windows system when you run the installer. +On Windows systems, Git looks for the `.gitconfig` file in the `$HOME` directory (`C:\Documents and Settings\$USER` for most people). It also still looks for /etc/gitconfig, although it’s relative to the MSys root, which is wherever you decide to install Git on your Windows system when you run the installer. ### Your Identity ### diff --git a/pt-br/01-introduction/01-chapter1.markdown b/pt-br/01-introduction/01-chapter1.markdown index b0df6c7f3..0b438cf63 100644 --- a/pt-br/01-introduction/01-chapter1.markdown +++ b/pt-br/01-introduction/01-chapter1.markdown @@ -2,7 +2,7 @@ Esse capítulo tratará sobre como iniciar-se no GIT. Nós iremos começar explicando alguns conceitos de ferramentas de controle de versão,então continuaremos em como instalar o GIT no seu sistema e finalmente como conseguir configurá-lo. Ao final desse capítulo você entenderá porque o GIT está por aí, porque usá-lo e como usá-lo. -# Sobre Controle de Versão ## +## Sobre Controle de Versão ## O que é controle de versão? Por que você deve se importar? O controle de versão é um sistema que registra as mudanças feitas em um arquivo ou um grupo de arquivos com o passar do tempo de forma que você possa rever versões específicas. Nos exemplos desse livro você colocará arquivos de código fonte sob controle de versão, embora você pudesse fazê-lo com praticamente qualquer tipo de arquivo de um computador. @@ -163,12 +163,12 @@ Or if you’re on a Debian-based distribution like Ubuntu, try apt-get: There are two easy ways to install Git on a Mac. The easiest is to use the graphical Git installer, which you can download from the Google Code page (see Figure 1-7): -http://code.google.com/p/git-osx-installer + http://code.google.com/p/git-osx-installer Insert 18333fig0107.png Figure 1-7. Git OS X installer -The other major way is to install Git via MacPorts (http://www.macports.org). If you have MacPorts installed, install Git via +The other major way is to install Git via MacPorts (`http://www.macports.org`). If you have MacPorts installed, install Git via $ sudo port install git-core +svn +doc +bash_completion +gitweb @@ -192,7 +192,7 @@ Git comes with a tool called git config that lets you get and set configuration * `~/.gitconfig` file: Specific to your user. You can make Git read and write to this file specifically by passing the `--global` option. * config file in the git directory (that is, `.git/config`) of whatever repository you’re currently using: Specific to that single repository. Each level overrides values in the previous level, so values in `.git/config` trump those in `/etc/sysconfig`. -On Windows systems, Git looks for the `.gitconfig` file in the `$HOME` directory (C:\Documents and Settings\$USER for most people). It also still looks for /etc/gitconfig, although it’s relative to the MSys root, which is wherever you decide to install Git on your Windows system when you run the installer. +On Windows systems, Git looks for the `.gitconfig` file in the `$HOME` directory (`C:\Documents and Settings\$USER` for most people). It also still looks for /etc/gitconfig, although it’s relative to the MSys root, which is wherever you decide to install Git on your Windows system when you run the installer. ### Your Identity ### diff --git a/pt-br/02-git-basics/01-chapter2.markdown b/pt-br/02-git-basics/01-chapter2.markdown index b8975e559..d2e4bc521 100644 --- a/pt-br/02-git-basics/01-chapter2.markdown +++ b/pt-br/02-git-basics/01-chapter2.markdown @@ -47,7 +47,7 @@ Remember that each file in your working directory can be in one of two states: t As you edit files, Git sees them as modified, because you’ve changed them since your last commit. You stage these modified files and then commit all your staged changes, and the cycle repeats. This lifecycle is illustrated in Figure 2-1. Insert 18333fig0201.png -Fig 2-1. The lifecycle of the status of your files +Figure 2-1. The lifecycle of the status of your files ### Checking the Status of Your Files ### diff --git a/zh/01-introduction/01-chapter1.markdown b/zh/01-introduction/01-chapter1.markdown index 12cb0cedf..2d45997f3 100644 --- a/zh/01-introduction/01-chapter1.markdown +++ b/zh/01-introduction/01-chapter1.markdown @@ -163,12 +163,12 @@ Or if you’re on a Debian-based distribution like Ubuntu, try apt-get: There are two easy ways to install Git on a Mac. The easiest is to use the graphical Git installer, which you can download from the Google Code page (see Figure 1-7): -http://code.google.com/p/git-osx-installer + http://code.google.com/p/git-osx-installer Insert 18333fig0107.png Figure 1-7. Git OS X installer -The other major way is to install Git via MacPorts (http://www.macports.org). If you have MacPorts installed, install Git via +The other major way is to install Git via MacPorts (`http://www.macports.org`). If you have MacPorts installed, install Git via $ sudo port install git-core +svn +doc +bash_completion +gitweb @@ -192,7 +192,7 @@ Git comes with a tool called git config that lets you get and set configuration * `~/.gitconfig` file: Specific to your user. You can make Git read and write to this file specifically by passing the `--global` option. * config file in the git directory (that is, `.git/config`) of whatever repository you’re currently using: Specific to that single repository. Each level overrides values in the previous level, so values in `.git/config` trump those in `/etc/sysconfig`. -On Windows systems, Git looks for the `.gitconfig` file in the `$HOME` directory (C:\Documents and Settings\$USER for most people). It also still looks for /etc/gitconfig, although it’s relative to the MSys root, which is wherever you decide to install Git on your Windows system when you run the installer. +On Windows systems, Git looks for the `.gitconfig` file in the `$HOME` directory (`C:\Documents and Settings\$USER` for most people). It also still looks for /etc/gitconfig, although it’s relative to the MSys root, which is wherever you decide to install Git on your Windows system when you run the installer. ### 个人身份标识 ###