Merge branch 'lt/pull-no-edit'
commit3c1e0d6a79ed9028d165056afa24af9960dac688
authorJunio C Hamano <gitster@pobox.com>
Tue, 14 Feb 2012 20:57:17 +0000 (14 12:57 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 14 Feb 2012 20:57:17 +0000 (14 12:57 -0800)
tree8a814cb58b8d396b9764ee303a5e32c05424bb4e
parenta49060324a5470f1722a24efebae81c0e6ff042a
parent8580830084c8917ac41d18e39dba276b237f598e
Merge branch 'lt/pull-no-edit'

* lt/pull-no-edit:
  "git pull" doesn't know "--edit"