On 7/16/08, Petr Baudis <pasky@xxxxxxx> wrote: > On Wed, Jul 16, 2008 at 02:51:30PM -0400, Avery Pennarun wrote: > > On 7/16/08, Junio C Hamano <gitster@xxxxxxxxx> wrote: > > > You can skip merges with "git log --no-merges", just in case you didn't > > > know. > > Perhaps this is mostly a user education or documentation issue. I > > know about --no-merges, but it's unclear that this is really a safe > > thing to use, particularly if some of your merges have conflicts. > > Leaving them out leaves out an important part of history. Do you use > > this option yourself? > > Whereas if you rebase, not only you don't show the conflicts resolution, > you didn't even _store_ it in the first place. That isn't much of an > improvement. :-) (This is the main reason why I prefer to avoid rebase > unless absolutely necessary for the workflow.) The key here is that I'd expect "git log -p" with a rebased merge at least shows me the actual changes that are in my repository. "git log --no-merges" will actually omit things. Avery -- 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
