Merge branch 'master' into next
* master:
builtin-mailinfo.c: check error status from rewind and ftruncate
Make just opening the generated MSVC solution file not modify it
Make generated MSVC solution file open from Windows Explorer
generators/vcproj.pm: remove UNICODE from build
typo fix: Directory `...' exist, ...: s/exist/exists/
Documentation/git-gc.txt: default --aggressive window is 250, not 10
Correct minor typo in post-receive hook template
git branch -D: give a better error message when lockfile creation fails
parse-opt: ignore negation of OPT_NONEG for ambiguity checks
make 'git clone' ask the remote only for objects it cares about