From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 25 Jun 2008 18:18:39 +0000 (-0700)
Subject: Merge branch 'sb/maint-rebase' into maint
X-Git-Tag: v1.5.6.1~5
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=340a6b58da21442492650f0e1d7e25be5253c677;p=git.git

Merge branch 'sb/maint-rebase' into maint

* sb/maint-rebase:
  git-rebase.sh: Add check if rebase is in progress
---

340a6b58da21442492650f0e1d7e25be5253c677