Merge branch 'oa/pull-reflog'
authorJunio C Hamano <gitster@pobox.com>
Mon, 8 Aug 2011 19:33:36 +0000 (12:33 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 8 Aug 2011 19:33:36 +0000 (12:33 -0700)
commit1421fd9df4f1e3ed232bd1c683c6e264a464a41e
tree7236b41402907f8f644f7623d655603084bb6404
parent68590435c147b3fdd4cbb1c068b2f9d793c02246
parentc98d1e4148ec32cac3318ca96dd262d27b9f8a03
Merge branch 'oa/pull-reflog'

* oa/pull-reflog:
  pull: remove extra space from reflog message

Conflicts:
git-pull.sh
git-pull.sh