Merge branch 'jc/commit-careful'

diff --git a/Documentation/git-pull.txt b/Documentation/git-pull.txt
index 20175f4b9a71c0299c57aab9f6c4452fb05cc53f..2a5aea73bafedd62f20cecb1fbf5069b515022bd 100644 (file)
--- a/Documentation/git-pull.txt
+++ b/Documentation/git-pull.txt
@@ -3,7 +3,7 @@ git-pull(1)
 
 NAME
 ----
-git-pull - Pull and merge from another repository.
+git-pull - Pull and merge from another repository or a local branch
 
 
 SYNOPSIS