From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 5 Dec 2016 19:24:17 +0000 (-0800)
Subject: Merge branch 'jk/common-main' into maint-2.10
X-Git-Tag: v2.11.1~67^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=cd1c2e7301820f9a198c8d665cd72d930233d02a;p=thirdparty%2Fgit.git

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
---

cd1c2e7301820f9a198c8d665cd72d930233d02a