Merge branch 'rs/rebase'
authorJunio C Hamano <junkio@cox.net>
Thu, 19 Oct 2006 05:08:31 +0000 (22:08 -0700)
committerJunio C Hamano <junkio@cox.net>
Thu, 19 Oct 2006 05:08:31 +0000 (22:08 -0700)
commita420585f3896c86a8641a0d46483acd2036cb5a3
treec8bc056db2a77b2a7f236b71289c7b67e40d6773
parenta4c6ae5a76f6f18876be69e5c1684f425e04bfc1
parentb758789c202dc491555b698149afe4d4941f7cd5
Merge branch 'rs/rebase'

* rs/rebase:
  git-rebase: Add a -v option to show a diffstat of the changes upstream at the start of a rebase.
  git-rebase: Use --ignore-if-in-upstream option when executing git-format-patch.