aboutsummaryrefslogtreecommitdiff
path: root/git-pull.sh
diff options
context:
space:
mode:
authorJohn Keeping <john@keeping.me.uk>2013-07-07 20:02:15 +0100
committerJunio C Hamano <gitster@pobox.com>2013-07-08 12:44:01 -0700
commit153d7265ef1277c1c9971780ad035a530e305f78 (patch)
treeb2d54d8a32827bfc795ce70c48235579033dc304 /git-pull.sh
parentfc6c4e96f13fe595fc8991d91c56f2abbe67dc89 (diff)
downloadgit-153d7265ef1277c1c9971780ad035a530e305f78.tar.gz
git-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 'git-pull.sh')
-rwxr-xr-xgit-pull.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/git-pull.sh b/git-pull.sh
index 638aabb7b..58597dbd9 100755
--- a/git-pull.sh
+++ b/git-pull.sh
@@ -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