summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorGravatar Joey Hess <joeyh@joeyh.name>2015-04-29 13:56:41 -0400
committerGravatar Joey Hess <joeyh@joeyh.name>2015-04-29 13:56:41 -0400
commit4ade15a1fc13771629f8d0f462b8db9f199c169d (patch)
treed8e483e228afd025979b622981eac5c1ba7fd041 /debian
parent2c6138624116e406509ac31cc6fdfdcb0614981c (diff)
import: Don't stop entire import when one file fails due to being gitignored or conflicting with something in the work tree.
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog2
1 files changed, 2 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index 527a09f41..ac96777ac 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,8 @@ git-annex (5.20150421) UNRELEASED; urgency=medium
lower case automatically.
* import: Check for gitignored files before moving them into the tree.
(Needs git 1.8.4 or newer.)
+ * import: Don't stop entire import when one file fails due to being
+ gitignored or conflicting with something in the work tree.
-- Joey Hess <id@joeyh.name> Tue, 21 Apr 2015 15:54:10 -0400