]> git.ipfire.org Git - thirdparty/git.git/commit - t/t5520-pull.sh
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: e509db9) | patch
pull --rebase: be cleverer with rebased upstream branches
authorJohannes Schindelin <Johannes.Schindelin@gmx.de>
Sat, 26 Jan 2008 18:04:37 +0000 (18:04 +0000)
committerJunio C Hamano <gitster@pobox.com>
Sun, 27 Jan 2008 02:24:24 +0000 (18:24 -0800)
commitc85c79279df2c8a583d95449d1029baba41f8660
tree41a2936893206ec54c80bb6e9004f760fdaf303ftree | snapshot
parente509db990b2ecae642efe3cdef4014d57d525f24commit | diff
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>
Documentation/git-pull.txt diff | blob | blame | history
git-pull.sh diff | blob | blame | history
t/t5520-pull.sh diff | blob | blame | history
Unnamed repository; edit this file 'description' to name the repository.