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>
12 years ago · 153d7265ef
2 changed files with 2 additions and 2 deletions
--- a/Documentation/git-pull.txt
+++ b/Documentation/git-pull.txt
@ -3,7 +3,7 @@ git-pull(1)
				@@ -3,7 +3,7 @@ git-pull(1)

 NAME
 ----
-git-pull - Fetch from and merge with another repository or a local branch
+git-pull - Fetch from and integrate with another repository or a local branch


 SYNOPSIS
--- a/git-pull.sh
+++ b/git-pull.sh
@ -5,7 +5,7 @@
				@@ -5,7 +5,7 @@
 # Fetch one or more remote refs and merge it/them into the current HEAD.

 USAGE='[-n | --no-stat] [--[no-]commit] [--[no-]squash] [--[no-]ff] [-s strategy]... [<fetch-options>] <repo> <head>...'
-LONG_USAGE='Fetch one or more remote refs and merge it/them into the current HEAD.'
+LONG_USAGE='Fetch one or more remote refs and integrate it/them with the current HEAD.'
 SUBDIRECTORY_OK=Yes
 OPTIONS_SPEC=
 . git-sh-setup