5 ms·
Git _can_ accomodate both! Just use merge commits, and collapse them when you want the simplified "linear list of merged PRs" history.
by Nullabillity 4y ago
Git _can_ accomodate both! Just use merge commits, and collapse them when you want the simplified "linear list of merged PRs" history.
- Nursie 4y agoCollapse? Are we talking about a particular UI? I'm firmly in the "record everything" camp myself but if I can point the 'other' team to an easy way to fulfil their needs it'll be a benefit.
- Nullabillity 4y agoYes, the git CLI! Try `git log --first-parent`. Not sure about which other frontends support it, but they should (if only to shut the squashers up).
- nicolaslem 4y agoOne reason I like cleaning up the history before merging is that anyone can then `git blame` and land on a commit that shows the feature/bugfix as a whole and hopefully with a clear explanation in the commit message. Not a bunch of "Fix typo" kind of commits. Any solution for that?
- Nullabillity 4y agoIt looks like git blame supports the same flag, and explicitly calls this out as a use case in the documentation!
- lozenge 4y agoI always used this but how do you add patches to the same output?