Merge branch 'nd/init-gitdir'

* nd/init-gitdir:
  init, clone: support --separate-git-dir for .git file
  git-init.txt: move description section up

Conflicts:
	builtin/clone.c

diff --cc builtin/clone.c
index 0b5601a9b080e079ec077a8a765be24f2bf9bd29,097beca3ab4675be9fb324d6624be92b5330c816..4144bcf5ca320057b5ef1f5dac9c2df19aba250b
--- 1/builtin/clone.c
--- 2/builtin/clone.c
+++ b/builtin/clone.c
@@@ -466,15 -468,15 +469,18 @@@ int cmd_clone(int argc, const char **ar
        setenv(CONFIG_ENVIRONMENT, mkpath("%s/config", git_dir), 1);
  
        if (safe_create_leading_directories_const(git_dir) < 0)
 -              die("could not create leading directories of '%s'", git_dir);
 +              die(_("could not create leading directories of '%s'"), git_dir);
-       set_git_dir(real_path(git_dir));
+ 
+       set_git_dir_init(git_dir, real_git_dir, 0);
+       if (real_git_dir)
+               git_dir = real_git_dir;
  
 -      if (0 <= option_verbosity)
 -              printf("Cloning into %s%s...\n",
 -                     option_bare ? "bare repository " : "", dir);
 +      if (0 <= option_verbosity) {
 +              if (option_bare)
 +                      printf(_("Cloning into bare repository %s...\n"), dir);
 +              else
 +                      printf(_("Cloning into %s...\n"), dir);
 +      }
        init_db(option_template, INIT_DB_QUIET);
  
        /*

diff --cc builtin/init-db.c
index 6621e5671cbc4cbe5631a40f918aa4f0f05bb62e,887939923236e65eda305c3c633879bf7084dc3f..b7370d9bb8f235f1cf39b1ffa768498ca1e88654
--- 1/builtin/init-db.c
--- 2/builtin/init-db.c
+++ b/builtin/init-db.c
@@@ -352,17 -409,10 +409,16 @@@ int init_db(const char *template_dir, u
        }
  
        if (!(flags & INIT_DB_QUIET)) {
-               const char *git_dir = get_git_dir();
                int len = strlen(git_dir);
 -              printf("%s%s Git repository in %s%s\n",
 -                     reinit ? "Reinitialized existing" : "Initialized empty",
 -                     shared_repository ? " shared" : "",
 +
 +              /*
 +               * TRANSLATORS: The first '%s' is either "Reinitialized
 +               * existing" or "Initialized empty", the second " shared" or
 +               * "", and the last '%s%s' is the verbatim directory name.
 +               */
 +              printf(_("%s%s Git repository in %s%s\n"),
 +                     reinit ? _("Reinitialized existing") : _("Initialized empty"),
 +                     shared_repository ? _(" shared") : "",
                       git_dir, len && git_dir[len-1] != '/' ? "/" : "");
        }
  

diff --cc cache.h
Simple merge

diff --cc t/t0001-init.sh
Simple merge

diff --cc t/t5601-clone.sh
Simple merge