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

minor typo fixes throughout

Browse source 
problematic
flexibility
This commit is contained in:
Yaroslav Halchenko 2016-06-01 21:46:58 -04:00 • committed by Joey Hess
parent 4fd28807c1
commit 64e844e1fe
Failed to extract signature
19 changed files with 22 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

4
doc/forum/How_to_revert_metadata_changes/comment_1_de40f1a3f364ca6d2f9bb489f4d64cb3._comment
View file

@ -16,7 +16,7 @@ complications:
file. This will cause git-annex to re-generate its index from the new
contents of the branch.
2. Resetting the git-annex branch to a previous rev won't "stick"
if the problimatic rev has already been pushed to other repositories.
if the problematic rev has already been pushed to other repositories.
git-annex will automatically re-merge the git-annex branches from other
repos at some point and get the problem rev back. Instead you'll need to
make a commit to the git-annex branch that undoes the changes made by the
@ -24,7 +24,7 @@ complications:
3. The contents of the git-annex branch are merged by essentially
taking the union of the local and remote contents.
So if some other clone of the repository still has the
problimatic data in its git-annex branch, when git-annex union
problematic data in its git-annex branch, when git-annex union
merges that in, the problem data will come back again, even if you've
made a local commit that reverts its addition.