epriestley 5a35dd233b Don't use --ff-only inside "Land Revision" ... Summary: Ref T182. I lifted this logic out of `arc`, but the context is a little different there, and this option is too strict in "Land Revision". Specifically, it prevents `git` from merging unless the merge is //strictly// a fast-foward, even with `--squash`. That means revisions can't merge unless they're rebased on the current `master`, even if they have no conflicts. (This whole process will probably need additional refinement, but the behavior without this flag is more reasonable overall than the behavior with it for now.) Test Plan: Will land stuff in production~~ Reviewers: chad, Mnkras Reviewed By: Mnkras Maniphest Tasks: T182 Differential Revision: https://secure.phabricator.com/D14346		2015-10-26 20:26:56 +00:00
..
__tests__	Add a bunch of tests for subclass implementations	2015-06-15 18:13:27 +10:00
DrydockAlmanacServiceHostBlueprintImplementation.php	Remove Drydock host resource limits and give working copies simple limits	2015-10-26 12:39:47 -07:00
DrydockBlueprintImplementation.php	Remove Drydock host resource limits and give working copies simple limits	2015-10-26 12:39:47 -07:00
DrydockWorkingCopyBlueprintImplementation.php	Don't use --ff-only inside "Land Revision"	2015-10-26 20:26:56 +00:00