tree bae2ad03e1ca04c3168e2f4bc2db840b14bc043d
parent 0a79ccaac7dcfaf93294979fd9608d0f95fd7a47
parent 6854a8f5c9ecf32f5bd85020e77d48d3ffdf48fc
author Junio C Hamano <gitster@pobox.com> 1480965857 -0800
committer Junio C Hamano <gitster@pobox.com> 1480965868 -0800

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