diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2015-05-12 13:23:22 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2015-05-12 13:23:22 -0400 |
| commit | 4d49342612dd441cdc503b5294035fc05a9a5a77 (patch) | |
| tree | 435a82d44b5a6aa3df411b36fb9fad2553cc670a /doc/tips/using_gitolite_with_git-annex.mdwn | |
| parent | 44a48a19ffeb8085e7ae1f6bf58d5661adaf8a8d (diff) | |
| parent | 5cd9e10cde3c06ecc6a97f5f60a9def22f959bd2 (diff) | |
Merge branch 'master' into concurrentprogress
Conflicts:
Command/Fsck.hs
Messages.hs
Remote/Directory.hs
Remote/Git.hs
Remote/Helper/Special.hs
Types/Remote.hs
debian/changelog
git-annex.cabal
Diffstat (limited to 'doc/tips/using_gitolite_with_git-annex.mdwn')
| -rw-r--r-- | doc/tips/using_gitolite_with_git-annex.mdwn | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/tips/using_gitolite_with_git-annex.mdwn b/doc/tips/using_gitolite_with_git-annex.mdwn index 31f34c6fb..0d20c9372 100644 --- a/doc/tips/using_gitolite_with_git-annex.mdwn +++ b/doc/tips/using_gitolite_with_git-annex.mdwn @@ -92,7 +92,7 @@ Make the ADC directory, and a "ua" subdirectory. mkdir -p /usr/local/lib/gitolite/adc/ua </pre> -Install the git-annex-shell ADC into the "ua" subdirectory from the gitolie repository. +Install the git-annex-shell ADC into the "ua" subdirectory from the gitolite repository. <pre> cd /usr/local/lib/gitolite/adc/ua/ |