diff options
| author | John Keeping <john@keeping.me.uk> | 2013-07-07 20:02:15 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-07-08 12:44:01 -0700 |
| commit | 153d7265ef1277c1c9971780ad035a530e305f78 (patch) | |
| tree | b2d54d8a32827bfc795ce70c48235579033dc304 /git-pull.sh | |
| parent | fc6c4e96f13fe595fc8991d91c56f2abbe67dc89 (diff) | |
| download | git-153d7265ef1277c1c9971780ad035a530e305f78.tar.gz | |
pull: change the description to "integrate" changesjk/pull-to-integrate
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-x | git-pull.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/git-pull.sh b/git-pull.sh index 638aabb7b3..58597dbd9b 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 |