On Tue, May 12, 2015 at 02:10:59PM -0400, Alan Conway wrote: > On Mon, 2015-05-11 at 09:36 -0400, Darryl L. Pierce wrote: > master-branch $ git merge --ff-only task-branch > > That will refuse to merge unless the merge is a "fast-forward", which is > the simple "copy my commits to the end of trunk" that we want. It is > just a safety check - if you do what Darryl says it has no effect, but > if you forgot to rebase properly git will complain instead of creating > an unintended merge commit.
+1 I've worked on a project that flat out rejects any commits that aren't FF. And it was very simple and clear to do a git --blame to look up where changes came from. > > http://mcpierce.blogspot.com/2012/08/git-fixup-and-autosquash.html > > > autosquash! Lovely! Git is full of nice surprises. When I learned the core set of tricks I use for working (interactive rebase, autofix/autosquash, bisect, cherry picking) is when I finally felt I was working with something more than just a version control system, but a power tool. :D -- Darryl L. Pierce, Sr. Software Engineer @ Red Hat, Inc. Delivering value year after year. Red Hat ranks #1 in value among software vendors. http://www.redhat.com/promo/vendor/
pgpPw4RchyTEz.pgp
Description: PGP signature
