Merge branch 'lt/decorate'

diff --git a/Documentation/githooks.txt b/Documentation/githooks.txt
index 7fefdb1f453720381b4038f773d8686dd41d7b0c..5faaaa5fedcd0d61234d3927a89d77144f2a15ad 100644 (file)
--- a/Documentation/githooks.txt
+++ b/Documentation/githooks.txt
@@ -130,6 +130,13 @@ parameter, and is invoked after a commit is made.
 This hook is meant primarily for notification, and cannot affect
 the outcome of 'git-commit'.
 
+pre-rebase
+----------
+
+This hook is called by 'git-rebase' and can be used to prevent a branch
+from getting rebased.
+
+
 post-checkout
 -----------