summaryrefslogtreecommitdiff
path: root/git-merge.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2008-03-07 10:53:14 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2008-03-07 10:53:14 -0800
commite3172d80d5c527048d67310692a8a62efc2c01e5 (patch)
tree31abfc9e1153412685f4a7b63be164bc6935b5cc /git-merge.sh
parentMerge branch 'cc/run-command' (diff)
parentDo not use GUID on dir in git init --shared=all on FreeBSD (diff)
downloadtgif-e3172d80d5c527048d67310692a8a62efc2c01e5.tar.xz
Merge branch 'ar/sgid-bsd'
* ar/sgid-bsd: Do not use GUID on dir in git init --shared=all on FreeBSD
Diffstat (limited to 'git-merge.sh')
0 files changed, 0 insertions, 0 deletions