Merge branch 'maint-1.6.1' into maint
authorJunio C Hamano <gitster@pobox.com>
Sun, 5 Apr 2009 08:04:54 +0000 (01:04 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sun, 5 Apr 2009 08:04:54 +0000 (01:04 -0700)
commitbe18f4b899a94ff51ff3c621822500579cf6df6a
tree4c51b65cbee630580fe470b4ed5ba695ce3187f0
parent38b7ccbe8c6615c709a4a69071c46593a1494952
parentacb0b7b01f64cf55d508b469eb2a351359c0cd82
Merge branch 'maint-1.6.1' into maint

* maint-1.6.1:
  commit: abort commit if interactive add failed
  git-repack: use non-dashed update-server-info
builtin-commit.c