diff options
author | Joey Hess <joey@kitenet.net> | 2011-04-08 16:46:39 -0400 |
---|---|---|
committer | Joey Hess <joey@kitenet.net> | 2011-04-08 16:46:39 -0400 |
commit | 208ce72e7dff553e4cad4e83a35d661dae462d1d (patch) | |
tree | da8ab9a569871ffe8b3c1d7dc7e592521115b2d1 /doc/not.mdwn | |
parent | 44c65f40b7f67ee5d53769c6e5fc87f2c7849425 (diff) | |
parent | fbd77e02177463efa1f546ec78e158de5475e793 (diff) |
Merge remote-tracking branch 'branchable/master'
Diffstat (limited to 'doc/not.mdwn')
-rw-r--r-- | doc/not.mdwn | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/not.mdwn b/doc/not.mdwn index 8d5dbd0b5..009e1a79d 100644 --- a/doc/not.mdwn +++ b/doc/not.mdwn @@ -31,7 +31,7 @@ * git-annex is also not [boar](http://code.google.com/p/boar/), although it shares many of its goals and characteristics. Boar implements - its own version control system, rather than simply embarcing and + its own version control system, rather than simply embracing and extending git. And while boar supports distributed clones of a repository, it does not support keeping different files in different clones of the same repository, which git-annex does, and is an important feature for |