projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: c065b6e) | patch
git-rebase: Use --ignore-if-in-upstream option when executing git-format-patch.
authorRobert Shearman <rob@codeweavers.com>
Tue, 3 Oct 2006 16:29:26 +0000 (17:29 +0100)
committerJunio C Hamano <junkio@cox.net>
Wed, 4 Oct 2006 22:02:04 +0000 (15:02 -0700)
commit91b489776c25866568c081e8cf4ae83fa41f8707
tree5521654b1e5a5c126109733cc1431909b91f3788tree | snapshot
parentc065b6e4293f856012ec53fcff7bf4d47ac50927commit | 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>
git-rebase.sh diff | blob | history
Git—the stupid content tracker