On Wed, Aug 10, 2011 at 6:53 AM, Øyvind Harboe <oyvind.har...@zylin.com> wrote:
> I am genuinely interested in hearing the pros and cons of rebasing
> vs. merging pull requests.
>
> rebasing yields a nice linear history, which I like. Perhaps I'm just
> old fashioned and used to it from Subversion days...

Hi Øyvind,
as I understand, merging would merge in all ones personal commits to a
personal git tree in a OpenOCD log history once it is is merged on the
master branch.

Rebase will leave just one commit on the top of the master.

I am opting for the rebase - why do we need many personal commit logs
in the official OpenOCD tree.

BR,
Drasko
_______________________________________________
Openocd-development mailing list
Openocd-development@lists.berlios.de
https://lists.berlios.de/mailman/listinfo/openocd-development

Reply via email to