Merge branch 'maint'
authorShawn O. Pearce <spearce@spearce.org>
Wed, 8 Oct 2008 15:05:43 +0000 (08:05 -0700)
committerShawn O. Pearce <spearce@spearce.org>
Wed, 8 Oct 2008 15:05:43 +0000 (08:05 -0700)
* maint:
Do not use errno when pread() returns 0
git init: --bare/--shared overrides system/global config
git-push.txt: Describe --repo option in more detail
git rm: refresh index before up-to-date check
Fix a few typos in relnotes

1  2 
builtin-push.c
index-pack.c
diff --cc builtin-push.c
Simple merge
diff --cc index-pack.c
Simple merge