diff options
| author |  Joey Hess <joey@kitenet.net> | 2011-06-29 11:42:35 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2011-06-29 11:42:35 -0400 |
| commit | af45d422248846869babdbc3eae2765d94ea9f20 (patch) | |
| tree | 6f1bea8cc19dedcd8ca40c046718f7f96e7454f8 /debian | |
| parent | 5034d8c2985dafeb141bba383ab70d75729b3cb6 (diff) | |
| parent | b3aaf980e460c2287fc1ef2b262685b1879e6ed0 (diff) | |
Merge branch 'master' into v3
Conflicts:
debian/changelog
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index 688a4adb8..5dff0bbe5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ git-annex (3.20110625) UNRELEASED; urgency=low * Always ensure git-annex branch exists. * Modify location log parser to allow future expansion. + * --force will cause add, etc, to operate on ignored files. -- Joey Hess <joeyh@debian.org> Sun, 26 Jun 2011 21:01:06 -0400 |