There's also the option of cleaning up your commits using interactive
rebase (git rebase -i, google for some examples, it's very neat).
Then there is the question of whether you actually want to have a
merge-commit as a "sign-off" for the completed feature, and keep the
smaller work-commits (al
Thanks. I either didn't see that in the books, or was asleep. I'll read up
on it.
On Dec 3, 2012 7:07 PM, "Ryan Hodson" wrote:
> I think what you're looking for is a squash merge. If you develop the
> change in a dedicated feature branch like you describe, you can
> transfer all of the changes t
I think what you're looking for is a squash merge. If you develop the
change in a dedicated feature branch like you describe, you can
transfer all of the changes to the master branch with the `--squash`
flag as follows:
git checkout master
git merge --squash some-feature
This concatenates all of
