commit | a6ec3c1599f990b4f2f3dab2606688639f74d844 | [log] [tgz] |
---|---|---|
author | Robert Shearman <rob@codeweavers.com> | Tue Oct 03 17:29:26 2006 +0100 |
committer | Junio C Hamano <junkio@cox.net> | Thu Nov 09 14:41:16 2006 -0800 |
tree | 67f3995486d87c46256b7cb4566a8b236a85e7f5 | |
parent | 45bf473a7bc2c40c8aea3d34a0eab7a41e77a8ff [diff] |
git-rebase: Use --ignore-if-in-upstream option when executing git-format-patch. 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>