John Keeping 153d7265ef 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>

2013-07-08 12:44:01 -07:00

7.7 KiB

Raw Blame History

View Raw