Michael Crosby 47c49018cf Merge pull request #3828 from tianon/add-user-email-to-dockerfile ...

Add dummy "user.email" setting in our Dockerfile for smooth in-container merge commits
Upstream-commit: 674ee1bc8e378063831491bdbb2f8bfdc50cdfd3
Component: engine

2014-01-31 11:03:17 -08:00

..

engine

Merge pull request #3828 from tianon/add-user-email-to-dockerfile

2014-01-31 11:03:17 -08:00