![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Wed, 5 Aug 2009 19:38:39 +0000 (12:38 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 5 Aug 2009 19:38:39 +0000 (12:38 -0700) | ||
| commit | e3e9af5baefff0ad6ab683dae438111db626a6c6 | |
| tree | 9edcb0f8951ac0725a886c9203246d501f7eebb9 | tree | snapshot |
| parent | 7d1b50981277c59a788298751f121567a1e75202 | commit | diff |
| parent | d44e71261f91d3cc81293e0976bb40daa8abb583 | commit | diff |
Merge branch 'sb/maint-pull-rebase'
* 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