Merge branch 'jn/no-g-plus-s-on-bsd'
commitdd57c76e84372bf16c6bdba9a1bd49da3e617339
authorJunio C Hamano <gitster@pobox.com>
Fri, 14 Oct 2011 02:03:21 +0000 (13 19:03 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 14 Oct 2011 02:03:21 +0000 (13 19:03 -0700)
tree2f64ac50c61dbf80bc409b8f21f55cd8a8436258
parent8b482c0ccca22857709e7f483f0079d7be7327f6
parent0b20dd8f3d48ed4ad90d2ce0dce768c0e013600b
Merge branch 'jn/no-g-plus-s-on-bsd'

* jn/no-g-plus-s-on-bsd:
  Makefile: do not set setgid bit on directories on GNU/kFreeBSD
Makefile