Skip to main content
3 events
when toggle format what by license comment
Mar 12, 2012 at 21:58 comment added Tom Clarkson No, you keep the full history, but a merge is actually a new commit with multiple parents, so you can see which commits are merges into master. A simple convention on commit messages to determine what sort of log they go into may also help.
Mar 12, 2012 at 21:13 comment added krlmlr Does this mean that all commits from a feature/bugfix branch that go into master are squashed?
Mar 12, 2012 at 0:45 history answered Tom Clarkson CC BY-SA 3.0