On Thu, Feb 19, 2009 at 12:57 PM, Jay Soffian <jaysoffian@xxxxxxxxx> wrote: > I tried out a few different option and none was very satisfactory to me. > > 1) > master rebases onto remote master > another-branch merges with remote next > some-other-branch rebases onto remote master > > Here, the unaligned "with" and "onto" is ugly. > > 2) > > master rebases onto remote master > another-branch merges with remote next > some-other-branch rebases onto remote master I also had a version that used the word "upstream" instead of remote, and another that put the actual remote name in place. e.g. master merges with upstream master master merges with origin master (assuming remote is "origin" of course.) j. -- 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
