Merge branch 'jk/common-main' into maint-2.10
authorJunio C Hamano <gitster@pobox.com>
Mon, 5 Dec 2016 19:24:17 +0000 (11:24 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 5 Dec 2016 19:24:28 +0000 (11:24 -0800)
* jk/common-main:
common-main: stop munging argv[0] path
git-compat-util: move content inside ifdef/endif guards

1  2 
git-compat-util.h
git.c
Simple merge
diff --cc git.c
Simple merge