![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <junkio@cox.net> | |
| Thu, 19 Oct 2006 05:08:31 +0000 (22:08 -0700) | ||
| committer | Junio C Hamano <junkio@cox.net> | |
| Thu, 19 Oct 2006 05:08:31 +0000 (22:08 -0700) |
* 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.
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.
Trivial merge