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

More typo fixes in doc/*.mdwn

Browse source
This commit is contained in:
Øyvind A. Holm 2015-04-17 18:32:03 +02:00
parent 238bad054b
commit 23425c6e9b
3 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
doc/git-union-merge.mdwn
View file

@ -12,7 +12,7 @@ Does a union merge between two refs, storing the result in the
specified newref. specified newref.
The union merge will always succeed, but assumes that files can be merged The union merge will always succeed, but assumes that files can be merged
simply by concacenating together lines from all the oldrefs, in any order. simply by concatenating together lines from all the oldrefs, in any order.
So, this is useful only for branches containing log-type data. So, this is useful only for branches containing log-type data.
Note that this does not touch the checked out working copy. It operates Note that this does not touch the checked out working copy. It operates

6
doc/preferred_content.mdwn
View file

@ -44,7 +44,7 @@ options in commands like this:
git annex get --include='*.mp3' --and -'(' --not --largerthan=100mb -')' git annex get --include='*.mp3' --and -'(' --not --largerthan=100mb -')'
The equivilant preferred content expression looks like this: The equivalent preferred content expression looks like this:
include=*.mp3 and (not largerthan=100mb) include=*.mp3 and (not largerthan=100mb)
@ -63,7 +63,7 @@ to not retain those files, like this:
### difference: no "in=" ### difference: no "in="
Preferred content expressions have no direct equivilant to `--in`. Preferred content expressions have no direct equivalent to `--in`.
Often, it's best to add repositories to groups, and match against Often, it's best to add repositories to groups, and match against
the groups in a preferred content expression. So rather than the groups in a preferred content expression. So rather than
@ -146,7 +146,7 @@ expression tuned for your needs, and every repository you put in this
group and make its preferred content be "groupwanted" will use it. group and make its preferred content be "groupwanted" will use it.
For example, the archive group only wants to archive 1 copy of each file, For example, the archive group only wants to archive 1 copy of each file,
spread amoung every repository in the group. spread among every repository in the group.
Here's how to configure a group named redundantarchive, that instead Here's how to configure a group named redundantarchive, that instead
wants to contain 3 copies of each file: wants to contain 3 copies of each file:

4
doc/related_software.mdwn
View file

@ -4,9 +4,9 @@ designed to interoperate with it.
* The [[git-annex assistant|assistant]] is included in git-annex, * The [[git-annex assistant|assistant]] is included in git-annex,
and extends its use cases into new territory. and extends its use cases into new territory.
* [gitlab-shell](https://gitlab.com/gitlab-org/gitlab-shell) supports * [gitlab-shell](https://gitlab.com/gitlab-org/gitlab-shell) supports
git-annex. So git-annex can be used with repositries served by Gitlab, git-annex. So git-annex can be used with repositories served by GitLab,
including gitlab.com, or deploy your own. including gitlab.com, or deploy your own.
[See Gitlab's announcment](https://about.gitlab.com/2015/02/17/gitlab-annex-solves-the-problem-of-versioning-large-binaries-with-git/) [See GitLab's announcement](https://about.gitlab.com/2015/02/17/gitlab-annex-solves-the-problem-of-versioning-large-binaries-with-git/)
* Emacs Org mode can auto-commit attached files to git-annex. * Emacs Org mode can auto-commit attached files to git-annex.
* [git annex darktable integration](https://github.com/xxv/darktable-git-annex) * [git annex darktable integration](https://github.com/xxv/darktable-git-annex)
* [Magit](http://github.com/magit/magit), an Emacs mode for Git, has * [Magit](http://github.com/magit/magit), an Emacs mode for Git, has