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>
John Keeping committed
Jul 7, 2013 at 20:02 UTC
153d7265ef1277c1c9971780ad035a530e305f78
2 files changed
+2
-2
Documentation/git-pull.txt
+1
-1
@@ -3,7 +3,7 @@ git-pull(1)
3
4
NAME
5
----
6
-git-pull - Fetch from and merge with another repository or a local branch
6
+git-pull - Fetch from and integrate with another repository or a local branch
7
8
9
SYNOPSIS
git-pull.sh
+1
-1
@@ -5,7 +5,7 @@
5
# Fetch one or more remote refs and merge it/them into the current HEAD.
6
7
USAGE='[-n | --no-stat] [--[no-]commit] [--[no-]squash] [--[no-]ff] [-s strategy]... [<fetch-options>] <repo> <head>...'
8
-LONG_USAGE='Fetch one or more remote refs and merge it/them into the current HEAD.'
8
+LONG_USAGE='Fetch one or more remote refs and integrate it/them with the current HEAD.'
9
SUBDIRECTORY_OK=Yes
10
OPTIONS_SPEC=
11
. git-sh-setup