{"thread":{"id":"5797","subject":"[PATCH] git-rebase: Use --ignore-if-in-upstream option when executing git-format-patch.","startedAt":"2006-10-03T16:29:26Z","lastAt":"2006-10-03T16:29:26Z","messageCount":1,"participants":["Robert Shearman"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"28158","messageId":"45228FE6.5060206@codeweavers.com","threadId":"5797","inReplyTo":null,"subject":"[PATCH] git-rebase: Use --ignore-if-in-upstream option when executing git-format-patch.","fromName":"Robert Shearman","fromEmail":"rob@codeweavers.com","sentAt":"2006-10-03T16:29:26Z","receivedAt":"2006-10-03T16:29:26Z","isPatch":true,"sender":{"key":"robertshearman@gmail.com","avatar":null},"body":"\nThis reduces the number of conflicts when rebasing after a series of \npatches to the same piece of code is committed upstream.\n\nSigned-off-by: Robert Shearman <rob@codeweavers.com>\n---\n  git-rebase.sh |    2 +-\n  1 files changed, 1 insertions(+), 1 deletions(-)\n\n\ndiff --git a/git-rebase.sh b/git-rebase.sh\nindex a7373c0..413636e 100755\n--- a/git-rebase.sh\n+++ b/git-rebase.sh\n@@ -286,7 +286,7 @@ fi\n \n if test -z \"$do_merge\"\n then\n-\tgit-format-patch -k --stdout --full-index \"$upstream\"..ORIG_HEAD |\n+\tgit-format-patch -k --stdout --full-index --ignore-if-in-upstream \"$upstream\"..ORIG_HEAD |\n \tgit am --binary -3 -k --resolvemsg=\"$RESOLVEMSG\" \\\n \t\t--reflog-action=rebase\n \texit $?\n\n"}]}