On Tue, Mar 27, 2007 at 06:06:11PM -0700, Linus Torvalds wrote: > The merge-base is the right thing to do for *merging*, but if you keep > merging into the branch you are developing on (to keep up-to-date), the > above "what is on the branch but not in the origin" is definitely the > right thing to do. Of course you're right, I must have had afternoon brain impairment when I wrote that other message. -Peff - 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