Code

Merge branch 'jc/bare'
authorJunio C Hamano <junkio@cox.net>
Fri, 12 Jan 2007 00:50:36 +0000 (16:50 -0800)
committerJunio C Hamano <junkio@cox.net>
Fri, 12 Jan 2007 00:50:36 +0000 (16:50 -0800)
* jc/bare:
  Disallow working directory commands in a bare repository.
  git-fetch: allow updating the current branch in a bare repository.
  Introduce is_bare_repository() and core.bare configuration variable
  Move initialization of log_all_ref_updates

1  2 
cache.h
config.c
git-am.sh
git-checkout.sh
git-commit.sh
git.c
refs.c

diff --cc cache.h
Simple merge
diff --cc config.c
Simple merge
diff --cc git-am.sh
Simple merge
diff --cc git-checkout.sh
Simple merge
diff --cc git-commit.sh
Simple merge
diff --cc git.c
Simple merge
diff --cc refs.c
Simple merge