From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 25 Jun 2008 20:20:26 +0000 (-0700)
Subject: Merge branch 'sb/rebase'
X-Git-Tag: v1.6.0-rc0~207
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=e2da671a642d5987d9a08f56b19172767272d9be;p=git.git

Merge branch 'sb/rebase'

* sb/rebase:
  t3404: stricter tests for git-rebase--interactive
  api-builtin.txt: update and fix typo
---

e2da671a642d5987d9a08f56b19172767272d9be