From: Junio C Hamano <junkio@cox.net>
Date: Thu, 19 Oct 2006 05:08:31 +0000 (-0700)
Subject: Merge branch 'rs/rebase'
X-Git-Tag: v1.4.4-rc1~91
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=a420585f3896c86a8641a0d46483acd2036cb5a3;p=git.git

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.
---

a420585f3896c86a8641a0d46483acd2036cb5a3