summaryrefslogtreecommitdiff
path: root/Documentation/git-pull.txt
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 /Documentation/git-pull.txt
parentfc6c4e96f13fe595fc8991d91c56f2abbe67dc89 (diff)
downloadgit-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 'Documentation/git-pull.txt')
-rw-r--r--Documentation/git-pull.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/git-pull.txt b/Documentation/git-pull.txt
index 24ab07a3f8..6ef8d599d3 100644
--- a/Documentation/git-pull.txt
+++ b/Documentation/git-pull.txt
@@ -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