I have no strong opinion. There is the magical 'git log --first-parent' and 'git blame --first-parent' if you just want to see each change on master (or whatever branch you are on)
That can be nicer if you have lots of PRs which have not been squashed/rebased Given the way git works as the ASF, committers need to do stuff to merge PRs, so we can pick our process. For PRs the advantage of the merge commit is that the hashes of the commits match those on the PR originally, which might be useful for clarifying that the author intended to submit the code under ALv2... on the other hand the patches in JIRA style doesn't have that issue, so perhaps we say rebase and fast-forward merges onto master only. Squashing only works where the changes have a single author. As a release manager, I like either Squashed commits OR explicit Merge commits. As a developer, I dislike squashed commits. I got the git developers to fix --first-parent so that merge commits could be nice for me. But these are my opinions. Really this needs to be a community decision. On Mon 16 Jan 2017 at 07:24, Hervé BOUTEMY <herve.bout...@free.fr> wrote: > do we want to keep such merge commits? > > > > I would have expected that when merging, we rebase then have no such merge > > commit: that branch work is just a temporary situation that completely > > disappears once merged (and we must not forget to delete merged branch) > > > > what do others think? > > > > Regards, > > > > Hervé > > > > Le lundi 16 janvier 2017, 02:17:26 CET schu...@apache.org a écrit : > > > Merge branch 'MNG-5629' > > > > > > > > > Project: http://git-wip-us.apache.org/repos/asf/maven/repo > > > Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/c6c5192d > > > Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/c6c5192d > > > Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/c6c5192d > > > > > > Branch: refs/heads/master > > > Commit: c6c5192d4bcb50c1aab6fade53dfb9c2f3d9b7e7 > > > Parents: a83296d ca1179c > > > Author: Christian Schulte <schu...@apache.org> > > > Authored: Mon Jan 16 03:16:49 2017 +0100 > > > Committer: Christian Schulte <schu...@apache.org> > > > Committed: Mon Jan 16 03:16:49 2017 +0100 > > > > > > ---------------------------------------------------------------------- > > > .../legacy/DefaultUpdateCheckManager.java | 61 > ++++++++------------ > > > 1 file changed, 24 insertions(+), 37 deletions(-) > > > ---------------------------------------------------------------------- > > > > > > > > --------------------------------------------------------------------- > > To unsubscribe, e-mail: dev-unsubscr...@maven.apache.org > > For additional commands, e-mail: dev-h...@maven.apache.org > > > > -- Sent from my phone
