Merge branch 'sb/rebase'
commite2da671a642d5987d9a08f56b19172767272d9be
authorJunio C Hamano <gitster@pobox.com>
Wed, 25 Jun 2008 20:20:26 +0000 (25 13:20 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 25 Jun 2008 20:20:26 +0000 (25 13:20 -0700)
treeb5ffbc3182f4894d36e1699df80361baf31c6133
parent78e996451b5aa5b38318aa613e1c713434c61dbb
parentab7367929f69c8b0f2f59d89225f211253ff57ef
Merge branch 'sb/rebase'

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