Merge pull request #60 from schacon/chapter-7-split

Chapter 7 Update

Author: schacon

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

@@ -1,3 +1,4 @@
+[[_git_aliases]]
 === Git Aliases
 
 (((aliases)))

book/03-git-branching/images/undomerge-reset.png

@@ -78,6 +78,16 @@ You can also do `git push origin serverfix:serverfix`, which does the same thing
 You can use this format to push a local branch into a remote branch that is named differently.
 If you didn't want it to be called `serverfix` on the remote, you could instead run `git push origin serverfix:awesomebranch` to push your local `serverfix` branch to the `awesomebranch` branch on the remote project.
 
+[NOTE]
+.Don't type your password every time
+====
+If you're using an HTTPS URL to push over, the Git server will ask you for your username and password for authentication. By default it will prompt you on the terminal for this information so the server can tell if you're allowed to push.
+
+If you don't want to type it every sinlge time you push, you can set up a ``credential cache''. The simplest is just to keep it in memory for a few mintues, which you can easily set up by running `git config --global credential.helper cache`.
+
+For more information on the various credential caching options available, see <<_credential_caching>>.
+====
+
 The next time one of your collaborators fetches from the server, they will get a reference to where the server's version of `serverfix` is under the remote branch `origin/serverfix`:
 
 [source,shell]