pull --rebase: be cleverer with rebased upstream branches

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

diff --git a/Documentation/git-pull.txt b/Documentation/git-pull.txt
index d4d26afea0fef29cd3e0ca2e7bb89f71d08d4c22..4cc633a5ec4c449e98ac9cb16fd125da6d336798 100644 (file)
--- a/Documentation/git-pull.txt
+++ b/Documentation/git-pull.txt
@@ -25,6 +25,7 @@ OPTIONS
 -------
 include::merge-options.txt[]
 
+:git-pull: 1
 include::fetch-options.txt[]
 
 include::pull-fetch-param.txt[]
@@ -34,11 +35,15 @@ include::urls-remotes.txt[]
 include::merge-strategies.txt[]
 
 \--rebase::
-       Instead of a merge, perform a rebase after fetching.
+       Instead of a merge, perform a rebase after fetching.  If
+       there is a remote ref for the upstream branch, and this branch
+       was rebased since last fetched, the rebase uses that information
+       to avoid rebasing non-local changes.
+
        *NOTE:* This is a potentially _dangerous_ mode of operation.
        It rewrites history, which does not bode well when you
        published that history already.  Do *not* use this option
-       unless you have read gitlink:git-rebase[1] carefully.
+       unless you have read linkgit:git-rebase[1] carefully.
 
 \--no-rebase::
        Override earlier \--rebase.
@@ -106,7 +111,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-config[1]
+       branch.<name>.merge options; see linkgit:git-config[1]
        for details.
 
 git pull origin next::
@@ -153,12 +158,12 @@ The final command then merges the newly fetched `tmp` into master.
 
 If you tried a pull which resulted in a complex conflicts and
 would want to start over, you can recover with
-gitlink:git-reset[1].
+linkgit:git-reset[1].
 
 
 SEE ALSO
 --------
-gitlink:git-fetch[1], gitlink:git-merge[1], gitlink:git-config[1]
+linkgit:git-fetch[1], linkgit:git-merge[1], linkgit:git-config[1]
 
 
 Author
@@ -174,4 +179,4 @@ Junio C Hamano and the git-list <git@vger.kernel.org>.
 
 GIT
 ---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite