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

sync: When there are merge conflicts that get automatically resolved, exit nonzero at the end.

Browse source
This commit is contained in:
Joey Hess 2013-11-07 15:02:11 -04:00
parent 365ecb6c2d
commit 4f373503f2
3 changed files with 13 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
debian/changelog vendored
View file

@ -11,6 +11,8 @@ git-annex (5.20131102) UNRELEASED; urgency=low
"git status" won't work in them.
* The -c option now not only modifies the git configuration seen by
git-annex, but it is passed along to every git command git-annex runs.
* sync: When there are merge conflicts that get automatically resolved,
exit nonzero at the end.
-- Joey Hess <joeyh@debian.org> Sat, 02 Nov 2013 14:54:36 -0400