summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJosh England <jjengla@sandia.gov>2007-10-09 10:04:42 -0600
committerShawn O. Pearce <spearce@spearce.org>2007-10-15 22:11:54 -0400
commit03618b9df84a0e94e36fdb27060e605e85b956e9 (patch)
tree198676c921114272ba157b32b4f71bfbdb923876
parentc90161586c174f740950ed56a748702ea3d9d6a1 (diff)
downloadgit-03618b9df84a0e94e36fdb27060e605e85b956e9.tar.gz
Minor usage update in setgitperms.perl
Signed-off-by: Josh England <jjengla@sandia.gov> Signed-off-by: Lars Hjemli <hjemli@gmail.com> Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
-rw-r--r--contrib/hooks/setgitperms.perl7
1 files changed, 4 insertions, 3 deletions
diff --git a/contrib/hooks/setgitperms.perl b/contrib/hooks/setgitperms.perl
index 5e3b89def2..dab7c8e3a1 100644
--- a/contrib/hooks/setgitperms.perl
+++ b/contrib/hooks/setgitperms.perl
@@ -8,13 +8,14 @@
# To save permissions/ownership data, place this script in your .git/hooks
# directory and enable a `pre-commit` hook with the following lines:
# #!/bin/sh
-# . git-sh-setup
+# SUBDIRECTORY_OK=1 . git-sh-setup
# $GIT_DIR/hooks/setgitperms.perl -r
#
# To restore permissions/ownership data, place this script in your .git/hooks
-# directory and enable a `post-merge` hook with the following lines:
+# directory and enable a `post-merge` and `post-checkout` hook with the
+# following lines:
# #!/bin/sh
-# . git-sh-setup
+# SUBDIRECTORY_OK=1 . git-sh-setup
# $GIT_DIR/hooks/setgitperms.perl -w
#
use strict;