Documentation: sync git.txt command list and manual page title

[git.git] / Documentation / git-pull.txt

diff --git a/Documentation/git-pull.txt b/Documentation/git-pull.txt
index 13be992006d8252ca737e37dd21ed8f2d1e13412..3e5f115728f580c2fa17a06f6cb12747f2fcc595 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 or a local branch
+git-pull - Fetch from and merge with another repository or a local branch
 
 
 SYNOPSIS
@@ -52,7 +52,8 @@ git pull origin next::
 
 git pull . fixes enhancements::
        Bundle local branch `fixes` and `enhancements` on top of
-       the current branch, making an Octopus merge.
+       the current branch, making an Octopus merge.  This `git pull .`
+       syntax is equivalent to `git merge`.
 
 git pull -s ours . obsolete::
        Merge local branch `obsolete` into the current branch,