Merge branch 'maint'
commit642f7108f68ef622b338d27d94a956e32c8567dd
authorJunio C Hamano <gitster@pobox.com>
Fri, 13 Aug 2010 01:07:09 +0000 (12 18:07 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 13 Aug 2010 01:07:09 +0000 (12 18:07 -0700)
tree32972655c14bdbd803e3842cb2220b9045632199
parent7980e41746bc5de91eea775f9142ce44b1100361
parent452c6d506b1a6dcf24d4ceaa592afc39c1c1a60e
Merge branch 'maint'

* maint:
  push: mention "git pull" in error message for non-fast forwards
  Standardize do { ... } while (0) style
  t/t7003: replace \t with literal tab in sed expression
  index-pack: Don't follow replace refs.
builtin/push.c