Yep. It will basically add all of your changes into the current branch like you did a real merge, but it just does not commit the result. If you 'git merge --squash', and then 'git status', you can see the changed files are ready to be committed, and you can commit them with one Big Commit.
The relevant part of the git manual: "This allows you to create a single commit on top of the current branch whose effect is the same as merging another branch." which is perfect for us! On Fri, Sep 13, 2013 at 11:36 AM, Simon Peyton-Jones <simo...@microsoft.com> wrote: > | also helps keep the history clean. An easy way to do this is: > | > | $ git checkout master > | $ git merge --squash type-nats-simple > > Does that make One Patch with a single coherent message, abandoning all the > intermediate commit messages on type-nats-simple? I hope so. > > Simon -- Austin Seipp, Haskell Consultant Well-Typed LLP, http://www.well-typed.com/ _______________________________________________ Glasgow-haskell-users mailing list Glasgow-haskell-users@haskell.org http://www.haskell.org/mailman/listinfo/glasgow-haskell-users
