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

comment

Browse source
This commit is contained in:
Joey Hess 2015-02-17 17:55:37 -04:00
parent 149d4bda61
commit ca4cd9f960
1 changed files with 11 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
doc/bare_repositories/comment_3_26ba93bddb0cd1bb4e1799311f3ca750._comment Normal file
View file

@ -0,0 +1,11 @@
[[!comment format=mdwn
username="joey"
subject="""comment 3"""
date="2015-02-17T21:54:33Z"
content="""
Since the two repos git-annex branches have diverged, you need to run `git
annex merge` to merge them before you can push that branch.
Of course, `git annex sync` handles all that for you. It can be used
against a bare repository as well as a non-bare.
"""]]