From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 12 Jul 2013 19:04:06 +0000 (-0700)
Subject: Merge branch 'jk/pull-to-integrate'
X-Git-Tag: v1.8.4-rc0~69
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5b307e95e880b95eafd36e93251c6638c222dcf4;p=thirdparty%2Fgit.git

Merge branch 'jk/pull-to-integrate'

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

5b307e95e880b95eafd36e93251c6638c222dcf4