summaryrefslogtreecommitdiff
path: root/Documentation/git-merge-one-file.txt
diff options
context:
space:
mode:
authorLibravatar Petr Baudis <pasky@suse.cz>2008-08-12 00:34:46 +0200
committerLibravatar Junio C Hamano <gitster@pobox.com>2008-08-11 17:07:17 -0700
commit7dce9918c72148139c3eb7a2a5c66b0df9ed415d (patch)
tree6a901ac578351bf715e6751a28fb03957237f416 /Documentation/git-merge-one-file.txt
parentFix typo in comments of longest_ancestor_length() (diff)
downloadtgif-7dce9918c72148139c3eb7a2a5c66b0df9ed415d.tar.xz
Adjust for the new way of enabling the default post-update hook
The post-update hook, which is required to be enabled in order for the repository to be accessible over HTTP, is not enabled by chmod a+x anymore, but instead by dropping the .sample suffix. This patch emphasizes this change in the release notes (since I believe this is rather noticeable backwards-incompatible change). It also adjusts the documentation which still described the old way and fixes t/t5540-http-push.sh, which was broken for 1.5 month but apparently noone ever runs this test. Signed-off-by: Petr Baudis <pasky@suse.cz> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-merge-one-file.txt')
0 files changed, 0 insertions, 0 deletions