[Mondrian] Git Fast-Forward

Patrick Leckey patl at seewind.com
Tue Mar 20 16:52:49 EDT 2012


Hi guys,

Just a suggestion on the GitHub repo.  I would recommend modifying the workflow to turn fast-forwards off when merging a branch.  This is by and large the recommended approach as it preserves the feature branch's commit history, making it *much* easier to sort through complex features that contain numerous commits.

There are 2 ways to do it.  If you're using Git 1.7.6 (summer 2011) or newer, you can run this from inside your repo folder:

# git config --add merge.ff false

If you're using an older version, you have to add the --no-ff flag on any merge commands:

# git merge --no-ff upstream/lagunitas

It does make the merge workflow a couple of commands longer if your local repo is out-of-date from the upstream branch, but a few commands isn't usually worth losing the commit history of a major patch / feature.

Anyways, just a thought.

Thanks,
Pat


More information about the Mondrian mailing list