summaryrefslogtreecommitdiff
path: root/builtin-merge-ours.c
diff options
context:
space:
mode:
authorLibravatar Johan Herland <johan@herland.net>2009-04-14 15:15:42 +0200
committerLibravatar Junio C Hamano <gitster@pobox.com>2009-04-18 12:51:06 -0700
commit098082fb78768dc3cbe659048c9f47cabdd7e39b (patch)
tree63add8c03bcd4986041233be724a9da77ce64ee5 /builtin-merge-ours.c
parentt1301-shared-repo: fix forced modes test (diff)
downloadtgif-098082fb78768dc3cbe659048c9f47cabdd7e39b.tar.xz
Update docs on behaviour of 'core.sharedRepository' and 'git init --shared'
This documentation update is needed to reflect the recent changes where "core.sharedRepository = 0mode" was changed to set, not loosen, the repository permissions. Signed-off-by: Johan Herland <johan@herland.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin-merge-ours.c')
0 files changed, 0 insertions, 0 deletions