From 153d7265ef1277c1c9971780ad035a530e305f78 Mon Sep 17 00:00:00 2001 From: John Keeping Date: Sun, 7 Jul 2013 20:02:15 +0100 Subject: 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 Signed-off-by: Junio C Hamano --- Documentation/git-pull.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Documentation') 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 -- cgit v1.2.3