| commit | c85c79279df2c8a583d95449d1029baba41f8660 | |
| author | Johannes Schindelin <Johannes.Schindelin@gmx.de> | |
| Sat, 26 Jan 2008 18:04:37 +0000 (26 18:04 +0000) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Sun, 27 Jan 2008 02:24:24 +0000 (26 18:24 -0800) | ||
| tree | 41a2936893206ec54c80bb6e9004f760fdaf303f | treesnapshot (tar.gz zip) |
| parent | e509db990b2ecae642efe3cdef4014d57d525f24 | commitdiff |
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>
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 | diffblobblamehistory | |
| git-pull.sh | diffblobblamehistory | |
| t/t5520-pull.sh | diffblobblamehistory |