Merge branch 'lt/pull-no-edit'
authorJunio C Hamano <gitster@pobox.com>
Tue, 14 Feb 2012 20:57:17 +0000 (12:57 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 14 Feb 2012 20:57:17 +0000 (12:57 -0800)
* lt/pull-no-edit:
  "git pull" doesn't know "--edit"


Trivial merge