From: Joey Hess <joeyh@joeyh.name>
Date: Wed, 9 Dec 2015 21:58:59 +0000 (-0400)
Subject: Merge branch 'master' into smudge
X-Git-Tag: archive/raspbian/10.20250416-2+rpi1~1^2~320^2~184^2~73
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=bf98d2bd7754355bf546fed6dc14a9758fd45970;p=git-annex.git

Merge branch 'master' into smudge
---

bf98d2bd7754355bf546fed6dc14a9758fd45970
diff --cc debian/changelog
index 6e4ba115c5,1ed8e37852..97dc5fab9c
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,14 -1,4 +1,15 @@@
++
 +  * annex.version increased to 6, but version 5 is also still supported.
 +  * The upgrade to version 6 is not done fully automatically, because
 +    upgrading a direct mode repository to version 6 will prevent old
 +    versions of git-annex from working in other clones of that repository.
 +  * smudge: New command, used for git smudge filter. 
 +    This will replace direct mode.
 +  * init: Configure .git/info/attributes to use git-annex as a smudge
 +    filter. Note that this changes the default behavior of git add in a
 +    newly initialized repository; it will add files to the annex.
 +
- git-annex (5.20151117) UNRELEASED; urgency=medium
+ git-annex (5.20151208) unstable; urgency=medium
  
    * Build with -j1 again to get reproducible build.
    * Display progress meter in -J mode when copying from a local git repo,