Merge branch 'jk/pull-to-integrate'

* jk/pull-to-integrate: pull: change the description to "integrate" changes push: avoid suggesting "merging" remote changes

Junio C Hamano committed Jul 12, 2013 at 12:04 UTC 5b307e95e880b95eafd36e93251c6638c222dcf4

No changes.