diff options
| author |  Robert Shearman <rob@codeweavers.com> | 2006-10-03 17:29:26 +0100 |
|---|---|---|
| committer |  Junio C Hamano <junkio@cox.net> | 2006-11-09 14:41:16 -0800 |
| commit | a6ec3c1599f990b4f2f3dab2606688639f74d844 (patch) | |
| tree | 67f3995486d87c46256b7cb4566a8b236a85e7f5 /mktree.c | |
| parent | git-svn: fix dcommit losing changes when out-of-date from svn (diff) | |
| download | tgif-a6ec3c1599f990b4f2f3dab2606688639f74d844.tar.xz | |
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 'mktree.c')
0 files changed, 0 insertions, 0 deletions