]> git.ipfire.org Git - thirdparty/git.git/commit
Merge branch 'nd/init-gitdir'
authorJunio C Hamano <gitster@pobox.com>
Sat, 2 Apr 2011 00:57:37 +0000 (17:57 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sat, 2 Apr 2011 00:57:37 +0000 (17:57 -0700)
commitc4b2ce69534e1d51f71142ba0e463ed89605ccd1
tree6cb1a1c828b387e14e2e39fc931892a609725527
parentffc5e3c958b66fb4babeba01483cc924bc2957a5
parentb57fb80a7d7d19102b31ab94a28ed43ea1ee07bb
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
builtin/clone.c
builtin/init-db.c
cache.h
t/t0001-init.sh
t/t5601-clone.sh