Merge branch 'lt/pull-no-edit'

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

Junio C Hamano committed Feb 14, 2012 at 12:57 UTC 3c1e0d6a79ed9028d165056afa24af9960dac688

No changes.