Merge branch 'maint-1.6.0' into maint-1.6.1
authorJunio C Hamano <gitster@pobox.com>
Sun, 5 Apr 2009 08:04:38 +0000 (01:04 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sun, 5 Apr 2009 08:04:38 +0000 (01:04 -0700)
* maint-1.6.0:
commit: abort commit if interactive add failed
git-repack: use non-dashed update-server-info

Conflicts:
builtin-commit.c

No differences found