diff options
| author |  Robert Shearman <rob@codeweavers.com> | 2006-10-03 17:29:26 +0100 |
|---|---|---|
| committer |  Junio C Hamano <junkio@cox.net> | 2006-10-04 15:02:04 -0700 |
| commit | 91b489776c25866568c081e8cf4ae83fa41f8707 (patch) | |
| tree | 5521654b1e5a5c126109733cc1431909b91f3788 /t/t6021-merge-criss-cross.sh | |
| parent | git-commit: cleanup unused function. (diff) | |
| download | tgif-91b489776c25866568c081e8cf4ae83fa41f8707.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 't/t6021-merge-criss-cross.sh')
0 files changed, 0 insertions, 0 deletions