diff options
| -rw-r--r-- | Command/Drop.hs | 2 | ||||
| -rw-r--r-- | Command/Fsck.hs | 2 | ||||
| -rw-r--r-- | debian/changelog | 2 | ||||
| -rw-r--r-- | doc/copies.mdwn | 2 | ||||
| -rw-r--r-- | doc/git-annex.mdwn | 4 | ||||
| -rw-r--r-- | doc/walkthrough.mdwn | 10 |
6 files changed, 11 insertions, 11 deletions
diff --git a/Command/Drop.hs b/Command/Drop.hs index 168aa92bd..7c4fbea60 100644 --- a/Command/Drop.hs +++ b/Command/Drop.hs @@ -18,7 +18,7 @@ import Messages import Utility seek :: [SubCmdSeek] -seek = [withAttrFilesInGit "git-annex-numcopies" start] +seek = [withAttrFilesInGit "annex.numcopies" start] {- Indicates a file's content is not wanted anymore, and should be removed - if it's safe to do so. -} diff --git a/Command/Fsck.hs b/Command/Fsck.hs index 4341f85cd..9acecfce6 100644 --- a/Command/Fsck.hs +++ b/Command/Fsck.hs @@ -14,7 +14,7 @@ import Messages import Utility seek :: [SubCmdSeek] -seek = [withAll (withAttrFilesInGit "git-annex-numcopies") start] +seek = [withAll (withAttrFilesInGit "annex.numcopies") start] {- Checks a file's backend data for problems. -} start :: SubCmdStartAttrFile diff --git a/debian/changelog b/debian/changelog index 3f66190e5..767583844 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,6 @@ git-annex (0.10) UNRELEASED; urgency=low - * In .gitattributes, the git-annex-numcopies attribute can be used + * In .gitattributes, the annex.numcopies attribute can be used to control the number of copies to retain of different types of files. * Bugfix: Always correctly handle gitattributes when in a subdirectory of the repository. (Had worked ok for ones like "*.mp3", but failed for diff --git a/doc/copies.mdwn b/doc/copies.mdwn index f157893ce..165e54b34 100644 --- a/doc/copies.mdwn +++ b/doc/copies.mdwn @@ -6,7 +6,7 @@ command. So, then using those backends, git-annex can be configured to try to keep N copies of a file's content available across all repositories. By default, N is 1; it is configured by annex.numcopies. This default -can be overridden on a per-file-type basis by the git-annex-numcopies +can be overridden on a per-file-type basis by the annex.numcopies setting in `.gitattributes` files. `git annex drop` attempts to check with other git remotes, to check that N diff --git a/doc/git-annex.mdwn b/doc/git-annex.mdwn index 09282e721..a2af9d990 100644 --- a/doc/git-annex.mdwn +++ b/doc/git-annex.mdwn @@ -276,10 +276,10 @@ but the SHA1 backend for ogg files: *.ogg git-annex-backend=SHA1 The numcopies setting can also be configured on a per-file-type basis via -the `git-annex-numcopies` attribute in `.gitattributes` files. +the `annex.numcopies` attribute in `.gitattributes` files. For example, this makes two copies be needed for wav files: - *.wav git-annex-numcopies=2 + *.wav annex.numcopies=2 # FILES diff --git a/doc/walkthrough.mdwn b/doc/walkthrough.mdwn index 9d4d2ce59..6a1c688b3 100644 --- a/doc/walkthrough.mdwn +++ b/doc/walkthrough.mdwn @@ -343,11 +343,11 @@ might say about a badly messed up annex: ## backups git-annex can be configured to require more than one copy of a file exists, -as a simple backup for your data. This is controled by the "numcopies" +as a simple backup for your data. This is controled by the "annex.numcopies" setting, which defaults to 1 copy. Let's change that to require 2 copies, and send a copy of every file to a USB drive. - # echo "* git-annex-numcopies=2" >> .gitattributes + # echo "* annex.numcopies=2" >> .gitattributes # git annex copy . --to usbdrive Now when we try to `git annex drop` a file, it will verify that it @@ -357,13 +357,13 @@ content from the current repository. You can also vary the number of copies needed, depending on the file name. So, if you want 3 copies of all your flac files, but only 1 copy of oggs: - # echo "*.ogg git-annex-numcopies=1" >> .gitattributes - # echo "*.flac git-annex-numcopies=3" >> .gitattributes + # echo "*.ogg annex.numcopies=1" >> .gitattributes + # echo "*.flac annex.numcopies=3" >> .gitattributes Or, you might want to make a directory for important stuff, and configure it so anything put in there is backed up more thoroughly: # mkdir important_stuff - # echo "* git-annex-numcopies=3" > important_stuff/.gitattributes + # echo "* annex.numcopies=3" > important_stuff/.gitattributes For more details about the numcopies setting, see [[copies]]. |