summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--doc/bugs/Prevent_accidental_merges.mdwn5
1 files changed, 5 insertions, 0 deletions
diff --git a/doc/bugs/Prevent_accidental_merges.mdwn b/doc/bugs/Prevent_accidental_merges.mdwn
index 9b0c8a3de..3e30e0223 100644
--- a/doc/bugs/Prevent_accidental_merges.mdwn
+++ b/doc/bugs/Prevent_accidental_merges.mdwn
@@ -7,3 +7,8 @@ Adding a tiny binary file called .gitnomerge to both branches would solve that w
Yes, there is an argument to be made that this is too much hand-holding, but I still think it's worth it.
-- Richard
+
+> It should be as easy to undo such an accidential merge
+> as it is to undo any other git commit, right? I quite like that git-annex
+> no longer adds any clutter to the master branch, and would be reluctant
+> to change that. --[[Joey]]