On Mon, 10 Nov 2014, Thomas D. wrote:
Hi,
On 2014-11-06 22:35, Michael Biebl wrote:
Wouldn't git log --no-merges solve your problem?
Mh. I don't think so.
To be honest, I don't care for "git log" at all. Only when doing a
bisect... maybe I am the only one who has problems when doing a bisect
and encounter a merge without further history (merge from branch $foo,
but no notice about what commits are included; so I don't know why the
change which is breaking the program for me was introduced at all)?
But unless there was a fixup needed for the merge, your bisect should not end at
the merge, it should go down each branch of the merge as needed to pinpoint the
change that broke things. The history of the branches is still there. If you
look at it with a graphical history tool, you will see the full history of the
development and then the merge combining that tree into the main tree.
squash + rebase throws all that history away.
David Lang
_______________________________________________
rsyslog mailing list
http://lists.adiscon.net/mailman/listinfo/rsyslog
http://www.rsyslog.com/professional-services/
What's up with rsyslog? Follow https://twitter.com/rgerhards
NOTE WELL: This is a PUBLIC mailing list, posts are ARCHIVED by a myriad of
sites beyond our control. PLEASE UNSUBSCRIBE and DO NOT POST if you DON'T LIKE
THAT.
