Details
-
Suggestion
-
Resolution: Obsolete
-
None
-
None
Description
Hi,
When work has finished on a feature branch it may contain a load of atomic commits that have no bearing on the living mainline, so when I merge it in I like to use the squash option so I end up with a working copy that has all the changes for that feature and then I can do a separate commit and give a nice commit message that encompasses that entire feature coming in off the branch.
This also allows me to revert the whole feature by reversing that commit.
For extra bonus points, if in the merge dialog, when you choose to squash, if you could give the option to create a new commit as well and a space for a commit message, that would be excellent.
Nice work on the tool, its interface is great, easy to use and is almost the best tool out there for Git. Keep working on those features
Cheers
James.
Attachments
Issue Links
- is duplicated by
-
SRCTREEWIN-515 Combine multiple commits to one
- Closed
-
SRCTREEWIN-726 Support Git Squashing
- Closed
-
SRCTREEWIN-566 A option to do a git merge --squash
- Gathering Interest
-
SRCTREEWIN-992 Allow squash option for merges
- Gathering Interest