diff options
| author | Robert Shearman <rob@codeweavers.com> | 2006-10-03 16:29:26 (GMT) |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-11-09 22:41:16 (GMT) |
| commit | a6ec3c1599f990b4f2f3dab2606688639f74d844 (patch) | |
| tree | 67f3995486d87c46256b7cb4566a8b236a85e7f5 /t | |
| parent | 45bf473a7bc2c40c8aea3d34a0eab7a41e77a8ff (diff) | |
| download | git-a6ec3c1599f990b4f2f3dab2606688639f74d844.zip git-a6ec3c1599f990b4f2f3dab2606688639f74d844.tar.gz git-a6ec3c1599f990b4f2f3dab2606688639f74d844.tar.bz2 | |
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>
Diffstat (limited to 't')
0 files changed, 0 insertions, 0 deletions