[Mondrian] Annoying git "Merge branch …" commits

Thiyagu Palanisamy thiyagu at thoughtworks.com
Mon Dec 3 14:07:44 EST 2012


Julian,

You can do : *git pull --rebase* instead of *git pull*

This will pull the changes from remote and apply your changes on top of it,
avoiding the merge.

http://gitready.com/advanced/2009/02/11/pull-with-rebase.html

Thanks,
Thiyagu


On Mon, Dec 3, 2012 at 7:34 PM, Julian Hyde <jhyde at pentaho.com> wrote:

> I just checked in a one line change to ivy.xml, and the previous commit
> (by Kurt I presume) was turned into "Merge branch 'lagunitas' of
> github.com:pentaho/mondrian into lagunitas<https://github.com/pentaho/mondrian/commit/66362601c5db5648e9b10b63d5c328910fd04b85>",
> apparently authored by me. (See the commits on Dec 3 at
> https://github.com/pentaho/mondrian/commits/lagunitas.)
>
> I don't want Kurt's work to appear to be authored by me, and with a
> generic "Merge ..." comment. Can any git expert out there tell me what I
> did wrong? And what I should do differently next time?
>
> Julian
>
> _______________________________________________
> Mondrian mailing list
> Mondrian at pentaho.org
> http://lists.pentaho.org/mailman/listinfo/mondrian
>
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.pentaho.org/pipermail/mondrian/attachments/20121203/0befda4a/attachment.html 


More information about the Mondrian mailing list