On Fri, Aug 6, 2010 at 8:05 AM, Elijah Newren <newren@xxxxxxxxx> wrote: > This patch series fixes git pull --rebase failing to detect if "local" > patches are already upstream in cases where the upstream repository is > not itself rebased. Also in the non-rebased upstream case, this > series avoids checking/applying more patches than needed (i.e. avoids > having rebase work on commits which are already reachable from > upstream). > > It would be nice to make 'git pull --rebase' able to detect if patches > being applied are already part of upstream in cases where the upstream > repository has been rebased. As far as I can tell, that would require > changes to format-patch to allow it to be told what 'upstream' is, and > some changes to git-pull.sh/git-rebase.sh to pass it this information. I obviously hadn't slept enough when I wrote the above paragraphs; they don't parse very well. Sorry about that. I just posted a new series, with some wording improvements and minor portability fixes. (For the benefit of those not following this list, to whom I gave a direct link to this thread, the updated series is here: http://thread.gmane.org/gmane.comp.version-control.git/152918) Elijah -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html