Allow forcing of a parent commit, even if the parent is not a direct one.

diff --git a/Documentation/git-pull.txt b/Documentation/git-pull.txt
index 13be992006d8252ca737e37dd21ed8f2d1e13412..a81d68ccefe6082b2c9327692ca96c29fedb695e 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
@@ -42,7 +42,7 @@ git pull, git pull origin::
        current branch.  Normally the branch merged in is
        the HEAD of the remote repository, but the choice is
        determined by the branch.<name>.remote and
-       branch.<name>.merge options; see gitlink:git-repo-config[1]
+       branch.<name>.merge options; see gitlink:git-config[1]
        for details.
 
 git pull origin next::
@@ -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,
@@ -93,7 +94,7 @@ gitlink:git-reset[1].
 
 SEE ALSO
 --------
-gitlink:git-fetch[1], gitlink:git-merge[1], gitlink:git-repo-config[1]
+gitlink:git-fetch[1], gitlink:git-merge[1], gitlink:git-config[1]
 
 
 Author