On Wed, Jun 29, 2011 at 4:25 PM, Jean-Christophe PLAGNIOL-VILLARD <plagn...@jcrosoft.com> wrote: > On 08:34 Wed 29 Jun , Øyvind Harboe wrote: >> So when I send a pull request to you from my repository, would >> you rebase or merge? > merge never rebase the master repo
I was thinking about branches you pull from. If you pull from two and one easily rebases on top of the other, then why should we not have a linear master history? >> We now have a nice linear history, which gives me a warm fuzzy >> feeling for a simple project like OpenOCD.... >> >> What would a typical pull request look like? >> >> Subject: Pull request - my master branch has some fixes >> > you just use "git request-pull" to generate the e-mail for you Nice :-) -- Øyvind Harboe - Can Zylin Consulting help on your project? US toll free 1-866-980-3434 / International +47 51 87 40 27 http://www.zylin.com/ _______________________________________________ Openocd-development mailing list Openocd-development@lists.berlios.de https://lists.berlios.de/mailman/listinfo/openocd-development
