summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorGravatar Joey Hess <joeyh@joeyh.name>2016-04-22 16:10:26 -0400
committerGravatar Joey Hess <joeyh@joeyh.name>2016-04-22 16:10:26 -0400
commit025e4765bfc60fbd33348d6f25077818a2d3bbda (patch)
tree411bebcc1a18048fe3e55a4e247c7a9fd45407c1 /doc
parentd3448906bb0be00ba4f67aa3ce334e38c1e42044 (diff)
devblog
Diffstat (limited to 'doc')
-rw-r--r--doc/devblog/day_385__new_features.mdwn16
1 files changed, 16 insertions, 0 deletions
diff --git a/doc/devblog/day_385__new_features.mdwn b/doc/devblog/day_385__new_features.mdwn
new file mode 100644
index 000000000..a2ff3ed19
--- /dev/null
+++ b/doc/devblog/day_385__new_features.mdwn
@@ -0,0 +1,16 @@
+Something that has come up repeatedly is that `git annex reinject` is
+too hard to use since you have to tell it which annexed file you're providing
+the content for. Now `git-annex reinject --known` can be passed a list of
+files and it will reinject any that hash to known annexed contents
+and ignore the rest. That works best when only one backend is used in a
+repository; otherwise it would need to be run repeatedly with different
+`--backend` values.
+
+Turns out that the `GIT_COMMON_DIR` feature used by adjusted branches
+is only a couple years old, so don't let adjusted branches be used with
+a too old git.
+
+And, `git merge` is getting a new sanity check that prevents merging
+in a branch with a disconnected history. `git annex sync` will inherit that
+sanity check, but the assistant needs to let such merges happen when eg,
+pairing repositories, so more git version checking there.