epriestley bbf4ce79e3 Provide a username and email when running git merge --squash ... Summary: Ref T182. This command should never actually generate a commit because `--squash` prevents that, but `git` seems to sometimes hit a check for username/email configuration (maybe when merging a non-fastforward?). Give it some dummy values to placate it. This command shouldn't commit anything so these values should never actually be used. Test Plan: Landed rGITTESTd8c8643cb02bbe60048c6c206afc2940c760a77e. Reviewers: chad, Mnkras Reviewed By: Mnkras Maniphest Tasks: T182 Differential Revision: https://secure.phabricator.com/D14347		2015-10-26 21:12:16 +00:00
..
__tests__	Use PhutilClassMapQuery instead of PhutilSymbolLoader	2015-08-14 07:49:01 +10:00
aphront	Fix /tag/aa%20bb project URIs	2015-10-12 17:02:42 -07:00
applications	Provide a username and email when running git merge --squash	2015-10-26 21:12:16 +00:00
docs	Write more detailed documentation about Differential inlines	2015-10-25 14:51:50 -07:00
extensions	Add src/extensions/ to Phabricator	2013-08-14 15:38:06 -07:00
infrastructure	Give Harbormaster build steps a "View" page	2015-10-26 12:38:32 -07:00
view	Truncate long source lines in Paste search result list snippets	2015-10-20 19:07:04 +00:00
__phutil_library_init__.php	Delete license headers from files	2012-11-05 11:16:51 -08:00
__phutil_library_map__.php	Give Harbormaster build steps a "View" page	2015-10-26 12:38:32 -07:00