Code

Merge branch 'maint'
authorJunio C Hamano <gitster@pobox.com>
Fri, 13 Aug 2010 01:07:09 +0000 (18:07 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 13 Aug 2010 01:07:09 +0000 (18:07 -0700)
* 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.

1  2 
builtin/push.c

diff --cc builtin/push.c
Simple merge