summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2013-11-26 16:15:49 -0400
committerGravatar Joey Hess <joey@kitenet.net>2013-11-26 16:15:49 -0400
commit6b8b5d1c175701b78dfb5f588ef261e32192ad8b (patch)
tree9e5d6dd0c2b7ceae611ca09dcf21f21e216a12a7
parent905ac846be08aaefbb6b15f8ef702fb8caf4b06b (diff)
reinject: Allow to be used in direct mode.
-rw-r--r--Command/Reinject.hs2
-rw-r--r--debian/changelog1
-rw-r--r--doc/todo/wishlist:_make_git_annex_reinject_work_in_direct_mode.mdwn3
3 files changed, 5 insertions, 1 deletions
diff --git a/Command/Reinject.hs b/Command/Reinject.hs
index e4abeef3c..c49af0060 100644
--- a/Command/Reinject.hs
+++ b/Command/Reinject.hs
@@ -14,7 +14,7 @@ import Annex.Content
import qualified Command.Fsck
def :: [Command]
-def = [notDirect $ command "reinject" (paramPair "SRC" "DEST") seek
+def = [command "reinject" (paramPair "SRC" "DEST") seek
SectionUtility "sets content of annexed file"]
seek :: [CommandSeek]
diff --git a/debian/changelog b/debian/changelog
index 437c7ac54..e36e2378a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -20,6 +20,7 @@ git-annex (5.20131121) UNRELEASED; urgency=low
* Android: Fix stripping of the git-annex binary.
* Android: Make terminal app show git-annex version number.
* Android: Re-enable XMPP support.
+ * reinject: Allow to be used in direct mode.
-- Joey Hess <joeyh@debian.org> Wed, 20 Nov 2013 18:30:47 -0400
diff --git a/doc/todo/wishlist:_make_git_annex_reinject_work_in_direct_mode.mdwn b/doc/todo/wishlist:_make_git_annex_reinject_work_in_direct_mode.mdwn
index 41c8e574b..ffdee8840 100644
--- a/doc/todo/wishlist:_make_git_annex_reinject_work_in_direct_mode.mdwn
+++ b/doc/todo/wishlist:_make_git_annex_reinject_work_in_direct_mode.mdwn
@@ -16,3 +16,6 @@ Description: Ubuntu 12.04.2 LTS
Release: 12.04
Codename: precise
~~~~
+
+> [[fixed|done]]. Why did I take so long to do this, it was a trivial 1
+> word change! --[[Joey]]