summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorGravatar Joey Hess <joeyh@joeyh.name>2015-12-22 18:10:40 -0400
committerGravatar Joey Hess <joeyh@joeyh.name>2015-12-22 18:10:40 -0400
commit52bce14ce4f6c4e7600c22819f655b9762f09e19 (patch)
treec3c2bf691767ef56d83a9a493c34bd21b9bcfccf /debian
parent0ee6ad2199575501c783e85b228f73a193e6672b (diff)
parent0c3a6a71c42b37d2cad29e2b259fcd192dfc39f0 (diff)
Merge branch 'master' into smudge
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog2
1 files changed, 1 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index d1c649a51..1ce79936e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -25,7 +25,7 @@ git-annex (5.20151219) UNRELEASED; urgency=medium
that were present. Probably caused by a change to what git status
displays in this situation. Fixed by treating files git thinks are
modified the same as typechanged files.
- * addurl: Added --batch option.
+ * addurl: Added --batch and --with-files options.
-- Joey Hess <id@joeyh.name> Sat, 19 Dec 2015 13:31:17 -0400