Merge branch 'sr/force-rebase'
authorJunio C Hamano <gitster@pobox.com>
Thu, 5 Mar 2009 23:41:40 +0000 (15:41 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 5 Mar 2009 23:41:40 +0000 (15:41 -0800)
* sr/force-rebase:
  Teach rebase to rebase even if upstream is up to date

1  2 
git-rebase.sh

diff --cc git-rebase.sh
Simple merge