mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

sync: When annex.autocommit=false, avoid making any commit of local changes, while still merging with remote to the extent possible.

Browse source
This commit is contained in:
Joey Hess 2015-07-07 16:36:11 -04:00
parent 81ad277a85
commit a51b98cdd5
4 changed files with 30 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

2
debian/changelog vendored
View file

@ -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