[Dune-devel] [Dune-Commit] [branch] dune-istl - 'master' updated

[Christoph Grüninger]

Hi Carsten!

> I'm tempted to propose that we introduce the policy
> to always do a manual non-fast-foward merge in this 
> situations, because it makes tracking the nonlinear
> history much easier:
> 
> A normal 'git log' will show you the commits from all parent
> branches. Instead of this you ofter really want
> 
>  git log --first-parent
> 
> which shows the merge commits itself but excludes individual
> commits coming with these merges. However in the situation
> described below it will show you the history branch from
> feature/FS1622 and not the one from master which is really 
> nasty.

I would oppose your proposition. That's the way Git handles
merges, and I prefer not having unnecessary merge commits as
they clutter the history.

Bye
Christoph

-- 
Je n'ai rien contre les étrangers, quelques uns de mes 
meilleurs amis
sont des étrangers. Mais ces étrangers là ne sont pas de chez 
nous!
[Agecanonix, Astérix - Le cadeau de César]