Merge branch 'jk/common-main' into maint-2.10
commitcd1c2e7301820f9a198c8d665cd72d930233d02a
authorJunio C Hamano <gitster@pobox.com>
Mon, 5 Dec 2016 19:24:17 +0000 (5 11:24 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 5 Dec 2016 19:24:28 +0000 (5 11:24 -0800)
treebae2ad03e1ca04c3168e2f4bc2db840b14bc043d
parent0a79ccaac7dcfaf93294979fd9608d0f95fd7a47
parent6854a8f5c9ecf32f5bd85020e77d48d3ffdf48fc
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
git-compat-util.h
git.c