Andrew's git / gitweb.git / diff
?
Merge branch 'sb/maint-rebase' into maint
authorJunio C Hamano <gitster@pobox.com>
Wed, 25 Jun 2008 18:18:39 +0000 (11:18 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 25 Jun 2008 18:18:39 +0000 (11:18 -0700)
* sb/maint-rebase:
git-rebase.sh: Add check if rebase is in progress

Trivial merge