From 3281a1cb19e25f964ca9b91877a194fcb216ca5d Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 27 Oct 2010 13:55:28 -0400 Subject: don't try to set up .gitattributes every time; only do it on git annex init --- doc/git-annex.mdwn | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'doc') diff --git a/doc/git-annex.mdwn b/doc/git-annex.mdwn index 3645d37f2..417ff7e58 100644 --- a/doc/git-annex.mdwn +++ b/doc/git-annex.mdwn @@ -91,7 +91,8 @@ Many git-annex subcommands will stage changes for later `git commit` by you. * init description - Initializes git-annex with a description of the git repository. + Initializes git-annex with a description of the git repository, + and sets up `.gitattributes` and the pre-commit hook. This is an optional, but recommended step. * unannex [path ...] @@ -106,6 +107,10 @@ Many git-annex subcommands will stage changes for later `git commit` by you. Fixes up symlinks that have become broken to again point to annexed content. This is useful to run if you have been moving the symlinks around. + You do not normally need to run this by hand since `git-annex init` + installs a pre-commit hook that automatically fixes up symlinks when + they are committed. + * fromkey file This can be used to maually set up a file to link to a specified key -- cgit v1.2.3