diff options
Diffstat (limited to 'doc/bare_repositories/comment_3_26ba93bddb0cd1bb4e1799311f3ca750._comment')
| -rw-r--r-- | doc/bare_repositories/comment_3_26ba93bddb0cd1bb4e1799311f3ca750._comment | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/doc/bare_repositories/comment_3_26ba93bddb0cd1bb4e1799311f3ca750._comment b/doc/bare_repositories/comment_3_26ba93bddb0cd1bb4e1799311f3ca750._comment new file mode 100644 index 000000000..b20ce0be8 --- /dev/null +++ b/doc/bare_repositories/comment_3_26ba93bddb0cd1bb4e1799311f3ca750._comment @@ -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. +"""]] |