![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Wed, 25 Jun 2008 18:18:39 +0000 (11:18 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 25 Jun 2008 18:18:39 +0000 (11:18 -0700) | ||
| commit | 340a6b58da21442492650f0e1d7e25be5253c677 | |
| tree | 669451af9482ef69d7710065648799dcbcd8d1b3 | tree | snapshot |
| parent | 87412ec1f17bc2705595ebabc010d94cb46478b7 | commit | diff |
| parent | cd5320f25228b4c3bbef2391df2696dca09d3d46 | commit | diff |
Merge branch 'sb/maint-rebase' into maint
* sb/maint-rebase:
git-rebase.sh: Add check if rebase is in progress
* sb/maint-rebase:
git-rebase.sh: Add check if rebase is in progress