From cf85d54a2f4ba8466e1d5c19598a613df4b04090 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 19 Apr 2023 12:20:26 -0400 Subject: [PATCH] comment and improve docs --- ...comment_7_8f9a5457020bed293e9a93ccc9461a65._comment | 10 ++++++++++ doc/sync.mdwn | 3 +++ 2 files changed, 13 insertions(+) create mode 100644 doc/git-annex-sync/comment_7_8f9a5457020bed293e9a93ccc9461a65._comment diff --git a/doc/git-annex-sync/comment_7_8f9a5457020bed293e9a93ccc9461a65._comment b/doc/git-annex-sync/comment_7_8f9a5457020bed293e9a93ccc9461a65._comment new file mode 100644 index 0000000000..3917322fa5 --- /dev/null +++ b/doc/git-annex-sync/comment_7_8f9a5457020bed293e9a93ccc9461a65._comment @@ -0,0 +1,10 @@ +[[!comment format=mdwn + username="joey" + subject="""Re: Sync to remote master?""" + date="2023-04-19T16:17:11Z" + content=""" +The push to remote master will typically fail in a non-bare repository +(it is possible to configure one to allow it). The push to synced/master +will then succeed. Then when sync is later run in that repository, it will +merge synced/master into master. +"""]] diff --git a/doc/sync.mdwn b/doc/sync.mdwn index cddccd1124..eb86133f46 100644 --- a/doc/sync.mdwn +++ b/doc/sync.mdwn @@ -29,6 +29,9 @@ to every other repository; as long as the graph of repositories is connected, and `git annex sync` is run from time to time on each, a given change, made anywhere, will eventually reach every other repository. +(`git-annex sync` will also attempt to push the master branch to remotes, +which does work for bare repositories.) + The workflow for using `git annex sync` is simple: * Make some changes to files in the repository, using `git-annex`,