Merge branch 'master' of ssh://git-annex.branchable.com

This commit is contained in:
Joey Hess 2018-09-25 13:20:41 -04:00
commit 355599b03f
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
2 changed files with 9 additions and 0 deletions

View file

@ -22,6 +22,14 @@ contains the date the field was last changed. Unlike other metadata,
this cannot be directly modified by this command. It is updated this cannot be directly modified by this command. It is updated
automatically. automatically.
Note that the metadata is attached to the particular content of a file
(or rather to a particular [key](http://git-annex.branchable.com/backends/)),
not to a particular file on a particular git branch. All files with given
content share the same metadata, which is stored on the
[git-annex branch](http://git-annex.branchable.com/internals#The_git-annex_branch).
If a file is [edited](http://git-annex.branchable.com/git-annex-unlock/),
old metadata will be copied to the new contents when you [[git-annex-add]] the edited file.
# OPTIONS # OPTIONS
* `-g field` / `--get field` * `-g field` / `--get field`

View file

@ -69,6 +69,7 @@ It will be re-created as necessary.
git-annex uses this to journal changes to the git-annex branch, git-annex uses this to journal changes to the git-annex branch,
before committing a set of changes. before committing a set of changes.
<a name="The_git-annex_branch"></a>
## The git-annex branch ## The git-annex branch
This branch is managed by git-annex, with the contents listed below. This branch is managed by git-annex, with the contents listed below.