summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorGravatar http://www.joachim-breitner.de/ <nomeata@web>2011-12-13 18:47:18 +0000
committerGravatar admin <admin@branchable.com>2011-12-13 18:47:18 +0000
commit1a06455f5cedb52324c6da6b13b7eedd72abe430 (patch)
tree84a428e13726c9cb95f261f7feba57c95ca64cf3 /doc
parent51b95fbc0792b6fc9ba546692896274987b48822 (diff)
Added a comment
Diffstat (limited to 'doc')
-rw-r--r--doc/forum/pure_git-annex_only_workflow/comment_5_afe5035a6b35ed2c7e193fb69cc182e2._comment24
1 files changed, 24 insertions, 0 deletions
diff --git a/doc/forum/pure_git-annex_only_workflow/comment_5_afe5035a6b35ed2c7e193fb69cc182e2._comment b/doc/forum/pure_git-annex_only_workflow/comment_5_afe5035a6b35ed2c7e193fb69cc182e2._comment
new file mode 100644
index 000000000..0847daae9
--- /dev/null
+++ b/doc/forum/pure_git-annex_only_workflow/comment_5_afe5035a6b35ed2c7e193fb69cc182e2._comment
@@ -0,0 +1,24 @@
+[[!comment format=mdwn
+ username="http://www.joachim-breitner.de/"
+ nickname="nomeata"
+ subject="comment 5"
+ date="2011-12-13T18:47:18Z"
+ content="""
+After some experimentation, this seems to work better:
+
+ git commit -a -m 'git annex sync'
+ git merge git-annex-master
+ for remote in $(git remote)
+ do
+ git fetch $remote
+ git merge $remote git-annex-master
+ done
+ git branch -f git-annex-master
+ git annex merge
+ for remote in $(git remote)
+ do
+ git push $remote git-annex git-annex-master
+ done
+
+Maybe this approach can be enhance to skip stuff gracefully if there is no git-annex-master branch and then be added to what \"git annex sync\" does, this way those who want to use the feature can do so by running \"git branch git-annex-master\" once. Or, if you like this and want to make it default, just make git-annex-init create the git-annex-master branch :-)
+"""]]