| commit | 5b307e95e880b95eafd36e93251c6638c222dcf4 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Fri, 12 Jul 2013 19:04:06 +0000 (12 12:04 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Fri, 12 Jul 2013 19:04:06 +0000 (12 12:04 -0700) | ||
| tree | 0d511facc0fe5969d5b923dde557349997be5a19 | treesnapshot (tar.gz zip) |
| parent | e70aee5c86c508af4a92bd02b688b4aa39c58180 | commitdiff |
| parent | 153d7265ef1277c1c9971780ad035a530e305f78 | commitdiff |
Merge branch 'jk/pull-to-integrate'
* jk/pull-to-integrate:
pull: change the description to "integrate" changes
push: avoid suggesting "merging" remote changes
* jk/pull-to-integrate:
pull: change the description to "integrate" changes
push: avoid suggesting "merging" remote changes
| builtin/push.c | diff1 | diff2 | blobhistory |
| git-pull.sh | diff1 | diff2 | blobhistory |