Merge branch 'jk/common-main' into maint-2.10

* jk/common-main: common-main: stop munging argv[0] path git-compat-util: move content inside ifdef/endif guards

Junio C Hamano committed Dec 5, 2016 at 11:24 UTC cd1c2e7301820f9a198c8d665cd72d930233d02a

No changes.