diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-07-12 12:04:06 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-07-12 12:04:06 -0700 |
| commit | 5b307e95e880b95eafd36e93251c6638c222dcf4 (patch) | |
| tree | 0d511facc0fe5969d5b923dde557349997be5a19 /argv-array.c | |
| parent | e70aee5c86c508af4a92bd02b688b4aa39c58180 (diff) | |
| parent | 153d7265ef1277c1c9971780ad035a530e305f78 (diff) | |
| download | git-5b307e95e880b95eafd36e93251c6638c222dcf4.tar.gz | |
Merge branch 'jk/pull-to-integrate'
* jk/pull-to-integrate:
pull: change the description to "integrate" changes
push: avoid suggesting "merging" remote changes
Diffstat (limited to 'argv-array.c')
0 files changed, 0 insertions, 0 deletions