Sync with 1.7.8.3

diff --combined Documentation/config.txt
index 6e63b5938f60f544cf3db3ce0d9a277964e99115,295939094f050c3b8ec1b95164bdd0b9b8c1dd95..27c7689007556e288b55107cfcb0f04d94b6c16e
--- 1/Documentation/config.txt
--- 2/Documentation/config.txt
+++ b/Documentation/config.txt
@@@ -674,12 -674,10 +674,12 @@@ branch.<name>.mergeoptions:
  branch.<name>.rebase::
        When true, rebase the branch <name> on top of the fetched branch,
        instead of merging the default branch from the default remote when
 -      "git pull" is run.
 -      *NOTE*: this is a possibly dangerous operation; do *not* use
 -      it unless you understand the implications (see linkgit:git-rebase[1]
 -      for details).
 +      "git pull" is run. See "pull.rebase" for doing this in a non
 +      branch-specific manner.
 ++
 +*NOTE*: this is a possibly dangerous operation; do *not* use
 +it unless you understand the implications (see linkgit:git-rebase[1]
 +for details).
  
  browser.<tool>.cmd::
        Specify the command to invoke the specified browser. The
@@@ -831,29 -829,6 +831,29 @@@ commit.template:
        "{tilde}/" is expanded to the value of `$HOME` and "{tilde}user/" to the
        specified user's home directory.
  
 +credential.helper::
 +      Specify an external helper to be called when a username or
 +      password credential is needed; the helper may consult external
 +      storage to avoid prompting the user for the credentials. See
 +      linkgit:gitcredentials[7] for details.
 +
 +credential.useHttpPath::
 +      When acquiring credentials, consider the "path" component of an http
 +      or https URL to be important. Defaults to false. See
 +      linkgit:gitcredentials[7] for more information.
 +
 +credential.username::
 +      If no username is set for a network authentication, use this username
 +      by default. See credential.<context>.* below, and
 +      linkgit:gitcredentials[7].
 +
 +credential.<url>.*::
 +      Any of the credential.* options above can be applied selectively to
 +      some credentials. For example "credential.https://example.com.username"
 +      would set the default username only for https connections to
 +      example.com. See linkgit:gitcredentials[7] for details on how URLs are
 +      matched.
 +
  include::diff-config.txt[]
  
  difftool.<tool>.path::
@@@ -1612,16 -1587,6 +1612,16 @@@ pretty.<name>:
        Note that an alias with the same name as a built-in format
        will be silently ignored.
  
 +pull.rebase::
 +      When true, rebase branches on top of the fetched branch, instead
 +      of merging the default branch from the default remote when "git
 +      pull" is run. See "branch.<name>.rebase" for setting this on a
 +      per-branch basis.
 ++
 +*NOTE*: this is a possibly dangerous operation; do *not* use
 +it unless you understand the implications (see linkgit:git-rebase[1]
 +for details).
 +
  pull.octopus::
        The default merge strategy to use when pulling multiple branches
        at once.
@@@ -1772,10 -1737,10 +1772,10 @@@ rerere.autoupdate:
  
  rerere.enabled::
        Activate recording of resolved conflicts, so that identical
-       conflict hunks can be resolved automatically, should they
-       be encountered again.  linkgit:git-rerere[1] command is by
-       default enabled if you create `rr-cache` directory under
-       `$GIT_DIR`, but can be disabled by setting this option to false.
+       conflict hunks can be resolved automatically, should they be
+       encountered again.  By default, linkgit:git-rerere[1] is
+       enabled if there is an `rr-cache` directory under the
+       `$GIT_DIR`.
  
  sendemail.identity::
        A configuration identity. When given, causes values in the