![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Robert Shearman <rob@codeweavers.com> | |
| Tue, 3 Oct 2006 16:29:26 +0000 (17:29 +0100) | ||
| committer | Junio C Hamano <junkio@cox.net> | |
| Thu, 9 Nov 2006 22:41:16 +0000 (14:41 -0800) | ||
| commit | a6ec3c1599f990b4f2f3dab2606688639f74d844 | |
| tree | 67f3995486d87c46256b7cb4566a8b236a85e7f5 | tree | snapshot |
| parent | 45bf473a7bc2c40c8aea3d34a0eab7a41e77a8ff | commit | 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>
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>
| git-rebase.sh | diff | blob | history |