Merge branch 'nd/clone-no-separate-git-dir-with-bare'
authorJunio C Hamano <gitster@pobox.com>
Tue, 22 Jan 2013 04:15:07 +0000 (20:15 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 22 Jan 2013 04:15:08 +0000 (20:15 -0800)
Forbid a useless combination of options to "git clone".

* nd/clone-no-separate-git-dir-with-bare:
  clone: forbid --bare --separate-git-dir <dir>

1  2 
builtin/clone.c

diff --cc builtin/clone.c
Simple merge