X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;ds=sidebyside;f=Documentation%2Fgithooks.txt;h=4cc3d1387fbdb60a2134a2e399fa46140939fe2f;hb=934c042c9cf09a14762b3fa094f1ba15ec721161;hp=79f633e837180c657f9a7867360363e7137496da;hpb=d821c003f80ed9dec813888f936b83eeedca20f6;p=git.git diff --git a/Documentation/githooks.txt b/Documentation/githooks.txt index 79f633e83..4cc3d1387 100644 --- a/Documentation/githooks.txt +++ b/Documentation/githooks.txt @@ -229,7 +229,7 @@ from updating that ref. This hook can be used to prevent 'forced' update on certain refs by making sure that the object name is a commit object that is a descendant of the commit object named by the old object name. -That is, to enforce a "fast forward only" policy. +That is, to enforce a "fast-forward only" policy. It could also be used to log the old..new status. However, it does not know the entire set of branches, so it would end up @@ -245,7 +245,7 @@ Both standard output and standard error output are forwarded to for the user. The default 'update' hook, when enabled--and with -`hooks.allowunannotated` config option turned on--prevents +`hooks.allowunannotated` config option unset or set to false--prevents unannotated tags to be pushed. [[post-receive]]