diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2015-02-17 17:55:37 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2015-02-17 17:55:37 -0400 |
| commit | 8e628903b3d81b14c952d12c0e5453e68a8a497e (patch) | |
| tree | c5baf730e59d426c10c09b3aceb9ce4881ae0f39 | |
| parent | 6a6a36e1f57300e2f20c593a4e8db96fb7b26238 (diff) | |
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. +"""]] |