From 4059b9aefedf830f671a4aa43225548ece190b61 Mon Sep 17 00:00:00 2001
From: "http://svario.it/gioele" <gioele@web>
Date: Sat, 12 Jul 2014 09:00:19 +0000
Subject: [PATCH] New topic "Recovering from a bad sync"

---
 doc/todo/Recovering_from_a_bad_sync.mdwn | 29 ++++++++++++++++++++++++
 1 file changed, 29 insertions(+)
 create mode 100644 doc/todo/Recovering_from_a_bad_sync.mdwn

diff --git a/doc/todo/Recovering_from_a_bad_sync.mdwn b/doc/todo/Recovering_from_a_bad_sync.mdwn
new file mode 100644
index 0000000000..4b7ca672cd
--- /dev/null
+++ b/doc/todo/Recovering_from_a_bad_sync.mdwn
@@ -0,0 +1,29 @@
+Instead of using `sync origin` for the first sync and a simple `sync` for the other syncs,
+
+    # on pc1
+    git annex init "pc1"
+    git annex direct
+    git annex add .
+    git annex sync origin # remote specified on the first sync
+
+    # add some files
+    git annex add .
+    git annex sync
+
+I used `sync` first and only later I used `sync origin`
+
+     # on pc1
+    git annex init "pc1"
+    git annex direct
+    git annex add .
+    git annex sync
+
+    # add some files
+    git annex add .
+    git annex sync origin  # remote specified on a later sync
+
+These sequences of commands create two completely different git histories.
+
+More important, if one clones on pc2 the first repository, they will see both the pc1 remote and the pc2 remote. Instead, if one clones on pc2 the repository created by the second combination of commands, they will see only the pc2 remote.
+
+What commands should I use on pc1 to fix the history so that when pc2 clones from the origin repository it will see both the pc1 remote and its own local remote?