On 8/27/2014 12:09 AM, Alan W. Irwin wrote: > Here are some questions concerning git capabilities and > our current workflow that you have documented in README.developers. > > Do you think it would be a good idea to change all the "git merge" > commands in your workflow documentation to use the --ff-only option? > That is use > > git merge --ff-only origin/master > > early in your workflow documentation and > > git merge --ff-only new_branch > > later in that documentation?
I added this. > And if you like that idea, is there a better way to implement ff-only > (say with a git config option that applies just to our repo)? And this, thanks for the suggestions. -Hazen ------------------------------------------------------------------------------ Slashdot TV. Video for Nerds. Stuff that matters. http://tv.slashdot.org/ _______________________________________________ Plplot-devel mailing list Plplot-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/plplot-devel
