Merge branch 'uk/maint-1.5.3-rebase-i-reflog' into maint
authorJunio C Hamano <gitster@pobox.com>
Thu, 11 Jun 2009 21:14:00 +0000 (14:14 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 11 Jun 2009 21:14:00 +0000 (14:14 -0700)
commita0c0447b8eda07529eec2ae8fbc6bf68e1ff2d67
treed44b88a9c5aadb106cfb822af26417146cb871d4
parent802f9c9cb21321d3ffe7576e01bbe31c51bd4c70
parent795cbe938fdc60228c4c9654a658aa27a7570b79
Merge branch 'uk/maint-1.5.3-rebase-i-reflog' into maint

* uk/maint-1.5.3-rebase-i-reflog:
  rebase--interactive: remote stray closing parenthesis

Conflicts:
git-rebase--interactive.sh
git-rebase--interactive.sh