Revert "moving credentials from chapter 9 to chapter 7"

This reverts commit b149f99.

Author: schacon

book/07-git-tools/1-git-tools.asc

@@ -29,9 +29,8 @@ include::sections/bundling.asc[]
 
 include::sections/replace.asc[]
 
-include::sections/credentials.asc[]
+include::sections/other-helpers.asc[]
 
-include::sections/rerere.asc[]
 
 === Summary
 

book/07-git-tools/sections/rerere.asc renamed to book/07-git-tools/sections/other-helpers.asc

@@ -1,5 +1,149 @@
-[[_rerere]]
-=== Rerere
+=== Other Helpers
+
+[[_credential_caching]]
+==== Credential Helpers
+
+If you don't want to type your username and password on the command line every time you push to an HTTPS Git URL, you can configure Git to pull your credentials from a store of some kind. There are various types of credential helpers available.((credential helpers))
+
+===== Memory Cache
+
+The stored credentials never touch the disk.
+
+	$ git config credential.helper cache
+
+Default is 15 minutes
+
+	$ git config credential.helper 'cache --timeout=300'
+
+Timeout is in seconds, so 300 would be 5 minutes.
+
+	$ git credential-cache exit
+
+Kills the daemon that stores the credentials early.
+
+===== Simple Disk Store
+
+	$ git config credential.helper store
+
+`~/.git-credentials`
+
+The .git-credentials file is stored in plaintext. Each credential is stored on its own line as a URL like:
+
+`https://user:[email protected]`
+
+===== Windows
+
+msysGit should install wincred helper
+
+msysgit.github.io
+
+	$ git config --global credential.helper wincred
+
+
+* GitHub for Windows
+
+
+https://gitcredentialstore.codeplex.com/
+
+[credential]
+helper = !\"C:/Program Files (x86)/GitExtensions/GitCredentialWinStore/git-credential-winstore.exe\"
+
+
+===== Mac Keychain
+
+To use this option, you need to install the `osxkeychain` credential helper and tell Git to use it. If you installed Git using Homebrew, the `osxkeychain` helper may already be installed.
+
+To find out if the `osxkeychain` credential helper is already installed, you can run it directly. If it's installed, you should see something like this:
+
+[source,shell]
+----
+$ git credential-osxkeychain
+usage: git credential-osxkeychain <get|store|erase>
+----
+
+If it's not installed, you'll see this:
+
+[source,shell]
+----
+$ git credential-osxkeychain
+# Test for the cred helper
+# git: 'credential-osxkeychain' is not a git command. See 'git --help'.
+----
+
+If you do not have the `osxkeychain` helper, you can build it yourself out of the `contrib/` directory of Git.
+
+[source,shell]
+----
+$ cd git/contrib/credential/osxkeychain
+$ make
+gcc -c -g -O2 -Wall git-credential-osxkeychain.c
+gcc -g -O2 -Wall -o git-credential-osxkeychain git-credential-osxkeychain.o -L/opt/boxen/homebrew/lib -Wl,-framework -Wl,Security
+----
+
+Now, move the helper into your path somewhere.
+
+[source,shell]
+----
+sudo mv git-credential-osxkeychain /usr/sbin/
+----
+
+Finally, tell Git to use `osxkeychain` using the global `credential.helper` config:
+
+[source,shell]
+----
+$ git config --global credential.helper osxkeychain
+----
+
+You can also delete stored credentials either from the Mac Keychain Access app or via the command line with the `erase` command.
+
+[source,shell]
+----
+$ git credential-osxkeychain erase
+host=github.com
+protocol=https
+----
+
+===== Gnome Keyring
+
+[source,shell]
+----
+$ cd /usr/share/git/credential/gnome-keyring
+$ make
+$ git config --global credential.helper /usr/share/git/credential/gnome-keyring/git-credential-gnome-keyring
+
+$ sudo apt-get install libgnome-keyring-dev
+$ cd /usr/share/doc/git/contrib/credential/gnome-keyring
+$ sudo make
+$ git config --global credential.helper /usr/share/doc/git/contrib/credential/gnome-keyring/git-credential-gnome-keyring
+----
+
+===== .netrc
+
+That script would allow you to use gpg-encrypted netrc files, avoiding the issue of having your credentials stored in a plain text file.
+
+-f|--file AUTHFILE
+specify netrc-style files.
+Files with the .gpg extension will be decrypted by GPG before parsing.
+Multiple -f arguments are OK. They are processed in order, and the first matching entry found is returned via the credential helper protocol (see below).
+
+When no -f option is given, .authinfo.gpg, .netrc.gpg, .authinfo, and .netrc files in your home directory are used in this order.
+
+To enable this credential helper:
+
+	$ git config credential.helper 'netrc -f AUTHFILE1 -f AUTHFILE2'
+
+	$ gpg -e -r a_recipient _netrc
+
+You now can delete the _netrc file, keeping only the _netrc.gpg encrypted one
+
+use that encrypted file
+
+	$ git config credential.helper "netrc -f C:/path/to/_netrc.gpg -v"
+
+===== Custom Helper
+
+
+==== Rerere
 
 The `git rerere` functionality is a bit of a hidden feature.  The name stands for ``reuse recorded resolution'' and as the name implies, it allows you to ask Git to remember how you've resolved a hunk conflict so that the next time it sees the same conflict, Git can automatically resolve it for you.
 

book/09-git-and-other-scms/1-git-and-other-scms.asc

@@ -41,6 +41,8 @@ include::sections/import-tfs.asc[]
 
 include::sections/import-custom.asc[]
 
+include::sections/credentials.asc[]
+
 === Summary
 
 You should feel comfortable using Git as a client for other version-control systems, or importing nearly any existing repository into Git without losing data.