Homec4science

Provide a username and email when running `git merge --squash`

Authored by epriestley <git@epriestley.com> on Oct 26 2015, 22:12.

Description

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

Details

Committed
epriestley <autocommitter@example.com>Oct 26 2015, 22:12
Pushed
aubortJan 31 2017, 17:16
Parents
rPH5a35dd233b19: Don't use --ff-only inside "Land Revision"
Branches
Unknown
Tags
Unknown

Event Timeline

epriestley <autocommitter@example.com> committed rPHbbf4ce79e341: Provide a username and email when running `git merge --squash` (authored by epriestley <git@epriestley.com>).Oct 26 2015, 22:12