| commit | 153d7265ef1277c1c9971780ad035a530e305f78 | |
| author | John Keeping <john@keeping.me.uk> | |
| Sun, 7 Jul 2013 19:02:15 +0000 (7 20:02 +0100) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 8 Jul 2013 19:44:01 +0000 (8 12:44 -0700) | ||
| tree | b2d54d8a32827bfc795ce70c48235579033dc304 | treesnapshot (tar.gz zip) |
| parent | fc6c4e96f13fe595fc8991d91c56f2abbe67dc89 | commitdiff |
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>
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>
| Documentation/git-pull.txt | diffblobblamehistory | |
| git-pull.sh | diffblobblamehistory |