Andrew's git / gitweb.git / diff
?
git-rebase: Use --ignore-if-in-upstream option when executing git-format-patch.
authorRobert Shearman <rob@codeweavers.com>
Tue, 3 Oct 2006 16:29:26 +0000 (17:29 +0100)
committerJunio C Hamano <junkio@cox.net>
Wed, 4 Oct 2006 22:02:04 +0000 (15:02 -0700)
This reduces the number of conflicts when rebasing after a series of
patches to the same piece of code is committed upstream.

Signed-off-by: Robert Shearman <rob@codeweavers.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
No differences found