From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 2 Jul 2007 08:45:47 +0000 (-0700)
Subject: Merge branch 'js/rebase'
X-Git-Tag: v1.5.3-rc0~13
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=f36db549057f09dd390d712fa2d72dd2599feba6;p=git.git

Merge branch 'js/rebase'

* js/rebase:
  Teach rebase -i about --preserve-merges
  rebase -i: provide reasonable reflog for the rebased branch
  rebase -i: several cleanups
  ignore git-rebase--interactive
  Teach rebase an interactive mode
  Move the pick_author code to git-sh-setup
---

f36db549057f09dd390d712fa2d72dd2599feba6