summaryrefslogtreecommitdiff
path: root/git-merge-ours.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <junkio@cox.net>2005-12-05 00:57:48 -0800
committerLibravatar Junio C Hamano <junkio@cox.net>2005-12-05 00:58:23 -0800
commitdc5f9239f7cc577b7d503017583dcc26ad5991f0 (patch)
tree8c69cabcd175fdd658fb8b013b031b2c13a3794c /git-merge-ours.sh
parentDocumentation: push/receive hook references. (diff)
downloadtgif-dc5f9239f7cc577b7d503017583dcc26ad5991f0.tar.xz
Documentation: shared repository management in tutorial.
The branch policy script I outlined was improved and polished by Carl and posted on the list twice since then. It is a shame not to pick it up, so replace the original outline in howto/update-hook-example.txt with the latest from Carl. Also talk about setting up git-shell to allow git-push/git-fetch only SSH access to a shared repository host in the tutorial. Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'git-merge-ours.sh')
0 files changed, 0 insertions, 0 deletions