summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--doc/bugs/__34__import__34___generates_a_commit_even_with_autocommit__61__false.mdwn5
-rw-r--r--doc/devblog/day_173-174__android_rebootstrap.mdwn6
2 files changed, 11 insertions, 0 deletions
diff --git a/doc/bugs/__34__import__34___generates_a_commit_even_with_autocommit__61__false.mdwn b/doc/bugs/__34__import__34___generates_a_commit_even_with_autocommit__61__false.mdwn
index a39bf362f..69e36595e 100644
--- a/doc/bugs/__34__import__34___generates_a_commit_even_with_autocommit__61__false.mdwn
+++ b/doc/bugs/__34__import__34___generates_a_commit_even_with_autocommit__61__false.mdwn
@@ -15,3 +15,8 @@ It happens in direct mode, I haven't tested with indirect mode.
### What version of git-annex are you using? On what operating system?
git-annex 5.20140421 from the Ubuntu PPA.
+
+> annex.autocommit has nothing to do with commits to the git-annex
+> branch. You want `git config annex.alwayscommit false`
+>
+> [[done]] --[[Joey]]
diff --git a/doc/devblog/day_173-174__android_rebootstrap.mdwn b/doc/devblog/day_173-174__android_rebootstrap.mdwn
new file mode 100644
index 000000000..87e486d56
--- /dev/null
+++ b/doc/devblog/day_173-174__android_rebootstrap.mdwn
@@ -0,0 +1,6 @@
+With some help from Sören, have been redoing the android build environment
+for git-annex. This included making propellor put it in a docker container,
+which was easy. But then much struggling with annoying stuff like getting
+the gnutls linking to work, and working around some dependency issues on
+hackage that make cabal's dependency resolver melt down.
+Finally succeeded after much more time than I had wanted to spend on this.