diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2015-07-07 16:36:11 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2015-07-07 16:36:11 -0400 |
| commit | cfb055f838da0c51a50224bf759b42fb263dcfec (patch) | |
| tree | d63a161f1728348bb1c7683ef5d122aa928c0cdd /debian | |
| parent | 032ee546c9cda12b4b85c05001220d47e8bbba4d (diff) | |
sync: When annex.autocommit=false, avoid making any commit of local changes, while still merging with remote to the extent possible.
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index d6db9d106..12af1736b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -25,6 +25,8 @@ git-annex (5.20150618) UNRELEASED; urgency=medium * merge: Avoid creating the synced/master branch. * add: Stage symlinks the same as git add would, even if they are not a link to annexed content. + * sync: When annex.autocommit=false, avoid making any commit of local + changes, while still merging with remote to the extent possible. -- Joey Hess <id@joeyh.name> Thu, 02 Jul 2015 12:31:14 -0400 |