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
Junio C Hamano committed
Jul 2, 2007 at 01:45 UTC
f36db549057f09dd390d712fa2d72dd2599feba6
No changes.