Merge branch 'jc/clone-branch-rebase'

* jc/clone-branch-rebase:
  Improve "git branch --tracking" output
  Make git-clone respect branch.autosetuprebase

Conflicts:
	builtin-clone.c

diff --cc builtin-clone.c
index efbc804a3d1c1f9edb1c8c21bc382f8c1c3836ff,a5f000adf456e8faee97c9db0e54713c0b4b3330..7fbfbf973c79494fe20a7d25cb3383da31574829
--- 1/builtin-clone.c
--- 2/builtin-clone.c
+++ b/builtin-clone.c
@@@ -20,8 -20,7 +20,9 @@@
  #include "dir.h"
  #include "pack-refs.h"
  #include "sigchain.h"
+ #include "branch.h"
 +#include "remote.h"
 +#include "run-command.h"
  
  /*
   * Overall FIXMEs:
@@@ -315,21 -351,10 +316,8 @@@ static struct ref *write_remote_refs(co
        return local_refs;
  }
  
- static void install_branch_config(const char *local,
-                                 const char *origin,
-                                 const char *remote)
- {
-       struct strbuf key = STRBUF_INIT;
-       strbuf_addf(&key, "branch.%s.remote", local);
-       git_config_set(key.buf, origin);
-       strbuf_reset(&key);
-       strbuf_addf(&key, "branch.%s.merge", local);
-       git_config_set(key.buf, remote);
-       strbuf_release(&key);
- }
- 
  int cmd_clone(int argc, const char **argv, const char *prefix)
  {
 -      int use_local_hardlinks = 1;
 -      int use_separate_remote = 1;
        int is_bundle = 0;
        struct stat buf;
        const char *repo_name, *repo, *work_tree, *git_dir;