mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

doc updates for import

Browse source
This commit is contained in:
Joey Hess 2019-03-09 13:10:30 -04:00
parent 6149a3b9bd
commit d9ee048d85
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
3 changed files with 9 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Command/Import.hs
View file

@ -37,7 +37,7 @@ cmd :: Command
cmd = notBareRepo $ cmd = notBareRepo $
withGlobalOptions [jobsOption, jsonOptions, fileMatchingOptions] $ withGlobalOptions [jobsOption, jsonOptions, fileMatchingOptions] $
command "import" SectionCommon command "import" SectionCommon
"move and add files from outside git working copy" "import files from elsewhere into the repository"
(paramPaths ++ "|BRANCH[:SUBDIR]") (paramPaths ++ "|BRANCH[:SUBDIR]")
(seek <$$> optParser) (seek <$$> optParser)

2
doc/git-annex-import.mdwn
View file

@ -1,6 +1,6 @@
# NAME # NAME
git-annex import - add files from a directory or special remote git-annex import - add files from a non-versioned directory or a special remote
# SYNOPSIS # SYNOPSIS

12
doc/git-annex.mdwn
View file

@ -148,7 +148,8 @@ subdirectories).
* `import [path ...]` * `import [path ...]`
Move and add files from outside git working copy into the annex. Add files from a non-version-controlled directory or a
special remote into the annex.
See [[git-annex-import]](1) for details. See [[git-annex-import]](1) for details.
@ -1268,16 +1269,17 @@ Here are all the supported configuration settings.
* `remote.<name>.annex-tracking-branch` * `remote.<name>.annex-tracking-branch`
This is for use with special remotes that support exports and imports.
When set to eg, "master", this tells git-annex that you want the When set to eg, "master", this tells git-annex that you want the
special remote to track that branch. special remote to track that branch.
When set to eg, "master:subdir", the special remote tracks only When set to eg, "master:subdir", the special remote tracks only
the subdirectory of that branch. the subdirectory of that branch.
`git-annex sync --content` and the git-annex assistant will `git-annex sync --content` will import changes from the remote and
import changes from the remote and merge them into the merge them into the annex-tracking-branch. They also export changes
annex-tracking-branch. They also export changes made to the branch to the made to the branch to the remote.
remote.
* `remote.<name>.annex-export-tracking` * `remote.<name>.annex-export-tracking`