![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Fri, 21 Aug 2009 18:33:08 +0000 (11:33 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Fri, 21 Aug 2009 18:33:08 +0000 (11:33 -0700) | ||
| commit | 07d6309e63aa272d2930540faa72147dc5be97a5 | |
| tree | 90ac260b170f62b92d4169de01f39dfcbf67460e | tree | snapshot |
| parent | 83e355a62cd05fba4533d59f9ab4e104c0596279 | commit | diff |
| parent | d44e71261f91d3cc81293e0976bb40daa8abb583 | commit | diff |
Merge branch 'sb/maint-pull-rebase' into maint
* sb/maint-pull-rebase:
pull: support rebased upstream + fetch + pull --rebase
t5520-pull: Test for rebased upstream + fetch + pull --rebase
* sb/maint-pull-rebase:
pull: support rebased upstream + fetch + pull --rebase
t5520-pull: Test for rebased upstream + fetch + pull --rebase