diff options
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/bugs/No_easy_way_to_re-inject_a_file_into_an_annex/comment_4_480a4f72445a636eab1b1c0f816d365c._comment | 3 | ||||
| -rw-r--r-- | doc/git-annex.mdwn | 11 |
2 files changed, 6 insertions, 8 deletions
diff --git a/doc/bugs/No_easy_way_to_re-inject_a_file_into_an_annex/comment_4_480a4f72445a636eab1b1c0f816d365c._comment b/doc/bugs/No_easy_way_to_re-inject_a_file_into_an_annex/comment_4_480a4f72445a636eab1b1c0f816d365c._comment index 787173b0a..fcca0561d 100644 --- a/doc/bugs/No_easy_way_to_re-inject_a_file_into_an_annex/comment_4_480a4f72445a636eab1b1c0f816d365c._comment +++ b/doc/bugs/No_easy_way_to_re-inject_a_file_into_an_annex/comment_4_480a4f72445a636eab1b1c0f816d365c._comment @@ -4,6 +4,5 @@ subject="comment 4" date="2011-05-14T16:29:35Z" content=""" -Although, if you really do want to shoot yourself in the foot, or know you -have the old content, you can use `git-annex setcontent`. +Now available as `git-annex reinject`. """]] diff --git a/doc/git-annex.mdwn b/doc/git-annex.mdwn index 42997e534..fdd8dd1c1 100644 --- a/doc/git-annex.mdwn +++ b/doc/git-annex.mdwn @@ -274,19 +274,18 @@ subdirectories). However, if a backend changes the information it uses to construct a key, this can also be used to migrate files to use the new key format. -* setcontent src dest +* reinject src dest - Makes the dest file, which must already be tracked by git-annex have the - content of the src file. The src file is removed. This can be useful if you - have obtained the content of a file from elsewhere and want to put it in - the local annex. + Moves the src file into the annex as the content of the dest file. + This can be useful if you have obtained the content of a file from + elsewhere and want to put it in the local annex. Automatically runs fsck on dest to check that the expected content was provided. Example: - git annex setcontent /tmp/foo.iso foo.iso + git annex reinject /tmp/foo.iso foo.iso * unannex [path ...] |