summaryrefslogtreecommitdiff
path: root/doc/bugs
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2012-09-22 03:36:44 +0000
committerGravatar Joey Hess <joey@kitenet.net>2012-09-22 03:36:44 +0000
commit553d0d321e2535d3bc36854ea1f3e279314bb2f2 (patch)
treee5049e00153e889ca5a5c2872603e5f760510460 /doc/bugs
parentc048add74dc91609e98e3513b0d167c5c7c9048c (diff)
parentad6d3e2a5b02b9f1c102a1add05f8edc2ba42cc0 (diff)
Merge remote branch 'origin/master'
Diffstat (limited to 'doc/bugs')
-rw-r--r--doc/bugs/git-annex_sync_broken_on_squeeze_backports.mdwn18
1 files changed, 18 insertions, 0 deletions
diff --git a/doc/bugs/git-annex_sync_broken_on_squeeze_backports.mdwn b/doc/bugs/git-annex_sync_broken_on_squeeze_backports.mdwn
new file mode 100644
index 000000000..9abf46c80
--- /dev/null
+++ b/doc/bugs/git-annex_sync_broken_on_squeeze_backports.mdwn
@@ -0,0 +1,18 @@
+What steps will reproduce the problem?
+
+ git-annex sync
+
+What is the expected output? What do you see instead?
+
+The following error is mixed in with the output, took me a while to notice it:
+
+ Running: git ["--git-dir=/spare/annex/.git","--work-tree=/spare/annex","merge","--no-edit","refs/remotes/pip/synced/master"]
+ error: unknown option `no-edit'
+
+What version of git-annex are you using? On what operating system?
+
+3.20120629~bpo60+1 on debian squeeze
+
+Please provide any additional information below.
+
+Installing git from backports as well cleared up the problem.