diff options
| author |  John Keeping <john@keeping.me.uk> | 2013-07-07 20:02:15 +0100 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2013-07-08 12:44:01 -0700 |
| commit | 153d7265ef1277c1c9971780ad035a530e305f78 (patch) | |
| tree | b2d54d8a32827bfc795ce70c48235579033dc304 /convert.c | |
| parent | push: avoid suggesting "merging" remote changes (diff) | |
| download | tgif-153d7265ef1277c1c9971780ad035a530e305f78.tar.xz | |
pull: change the description to "integrate" changes
Since git-pull learned the --rebase option it has not just been about
merging changes from a remote repository (where "merge" is in the sense
of "git merge"). Change the description to use "integrate" instead of
"merge" in order to reflect this.
Signed-off-by: John Keeping <john@keeping.me.uk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'convert.c')
0 files changed, 0 insertions, 0 deletions