Re: [git-users] Treat merges as squashed commits in git log/git blame/gitk etc

2015-09-11 Thread Philip Oakley
nt: Friday, September 11, 2015 11:52 AM Subject: Re: [git-users] Treat merges as squashed commits in git log/git blame/gitk etc Well that was interesting, but --first-parent does not do what you'd expect on git blame. I was able to construct a command sequence to do what I want though: gi

Re: [git-users] Treat merges as squashed commits in git log/git blame/gitk etc

2015-09-11 Thread Stephen Connolly
Re: [git-users] Treat merges as squashed commits in git > log/git blame/gitk etc > > - Original Message - > > *From:* Stephen Connolly <stephen.alan.conno...@gmail.com> > *To:* Git for human beings <git-users@googlegroups.com> > *Sent:* Wednesday, September

Re: [git-users] Treat merges as squashed commits in git log/git blame/gitk etc

2015-09-10 Thread Philip Oakley
- Original Message - From: Philip Oakley To: git-users@googlegroups.com Sent: Thursday, September 10, 2015 8:48 AM Subject: Re: [git-users] Treat merges as squashed commits in git log/git blame/gitk etc - Original Message - From: Stephen Connolly To: Git

[git-users] Treat merges as squashed commits in git log/git blame/gitk etc

2015-09-09 Thread Stephen Connolly
Hi, At my work and on some of the open source communities that I contribute to, there is a healthy debate about how to handle merge commits. I can break this into two camps: * People who think that when you are merging a change from a pull request, you should squash all commits immediately