summaryrefslogtreecommitdiff
path: root/Documentation/git-pull.txt
diff options
context:
space:
mode:
authorJohannes Schindelin <Johannes.Schindelin@gmx.de>2008-01-26 18:04:37 (GMT)
committerJunio C Hamano <gitster@pobox.com>2008-01-27 02:24:24 (GMT)
commitc85c79279df2c8a583d95449d1029baba41f8660 (patch)
tree41a2936893206ec54c80bb6e9004f760fdaf303f /Documentation/git-pull.txt
parente509db990b2ecae642efe3cdef4014d57d525f24 (diff)
downloadgit-c85c79279df2c8a583d95449d1029baba41f8660.zip
git-c85c79279df2c8a583d95449d1029baba41f8660.tar.gz
git-c85c79279df2c8a583d95449d1029baba41f8660.tar.bz2
pull --rebase: be cleverer with rebased upstream branches
When the upstream branch is tracked, we can detect if that branch was rebased since it was last fetched. Teach git to use that information to rebase from the old remote head onto the new remote head. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-pull.txt')
-rw-r--r--Documentation/git-pull.txt6
1 files changed, 5 insertions, 1 deletions
diff --git a/Documentation/git-pull.txt b/Documentation/git-pull.txt
index f9f1e0d..4cc633a 100644
--- a/Documentation/git-pull.txt
+++ b/Documentation/git-pull.txt
@@ -35,7 +35,11 @@ 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