git-annex/Annex
Joey Hess 858d776352 Merge branch 'master' into relativepaths
Conflicts:
	Locations.hs
	debian/changelog
2015-01-06 19:00:01 -04:00
..
Branch vicfg: Deleting configurations now resets to the default, where before it has no effect. 2014-10-14 14:15:07 -04:00
Content Merge branch 'master' into relativepaths 2015-01-06 19:00:01 -04:00
Direct made parentDir return a Maybe FilePath; removed most uses of it 2015-01-06 18:55:56 -04:00
MetaData toplevel lastchanged field 2014-03-19 19:10:55 -04:00
View Windows: Fix handling of views of filenames containing '%' 2014-12-30 17:48:04 -04:00
AutoMerge.hs resolvemerge: finish up by committing 2014-07-11 16:59:49 -04:00
Branch.hs absolute path to index file; test suite passes 2015-01-06 17:34:02 -04:00
BranchState.hs remove git-annex branch read cache 2012-10-19 14:25:15 -04:00
CatFile.hs fix some mixed space+tab indentation 2014-10-09 15:09:11 -04:00
CheckAttr.hs finished where indentation changes 2012-12-13 00:24:19 -04:00
CheckIgnore.hs fix some mixed space+tab indentation 2014-10-09 15:09:11 -04:00
Content.hs made parentDir return a Maybe FilePath; removed most uses of it 2015-01-06 18:55:56 -04:00
Direct.hs Merge branch 'master' into relativepaths 2015-01-06 19:00:01 -04:00
Drop.hs unify exception handling into Utility.Exception 2014-08-07 22:03:29 -04:00
Environment.hs Windows: Fix crash when user.name is not set in git config. 2014-10-31 16:14:12 -04:00
FileMatcher.hs fix some mixed space+tab indentation 2014-10-09 15:09:11 -04:00
Hook.hs fix handling of nonexistant hook 2014-03-03 13:59:36 -04:00
Index.hs unify exception handling into Utility.Exception 2014-08-07 22:03:29 -04:00
Init.hs fixed all remaining build warnings on Windows 2014-12-29 17:30:20 -04:00
Journal.hs unify exception handling into Utility.Exception 2014-08-07 22:03:29 -04:00
Link.hs diffdriver: New git-annex command, to make git external diff drivers work with annexed files. 2014-11-24 16:14:06 -04:00
LockFile.hs reorganize and refactor lock code 2014-08-20 16:45:58 -04:00
MakeRepo.hs support commit.gpgsign 2014-07-04 11:53:51 -04:00
MetaData.hs really add non-date metadata too 2014-07-03 14:35:20 -04:00
Notification.hs Notification: Add action/status-dependent icon and urgency 2014-04-05 20:45:11 +03:00
Path.hs move programPath out of Config.Files to Annex.Path 2013-11-24 16:03:03 -04:00
Perms.hs made parentDir return a Maybe FilePath; removed most uses of it 2015-01-06 18:55:56 -04:00
Queue.hs type based git config handling for remotes 2013-01-01 13:58:14 -04:00
Quvi.hs Probe for quvi version at run time. 2014-02-28 14:54:02 -04:00
ReplaceFile.hs made parentDir return a Maybe FilePath; removed most uses of it 2015-01-06 18:55:56 -04:00
Ssh.hs made parentDir return a Maybe FilePath; removed most uses of it 2015-01-06 18:55:56 -04:00
TaggedPush.hs indent with tabs not spaces 2014-10-09 15:09:26 -04:00
Transfer.hs fix some mixed space+tab indentation 2014-10-09 15:09:11 -04:00
Url.hs memoize construction of the Request -> Request function to apply the UrlOptions 2014-08-15 17:47:21 -04:00
UUID.hs move dummy uuids to Annex.UUID 2014-12-17 13:57:52 -04:00
VariantFile.hs sync: Fix bug in direct mode that caused a file not checked into git to be deleted when merging with a remote that added a file by the same name. (Thanks, jkt) 2014-03-03 14:57:16 -04:00
Version.hs Auto-upgrade v3 indirect repos to v5 with no changes. This also fixes a problem when a direct mode repo was somehow set to v3 rather than v4, and so the automatic direct mode upgrade to v5 was not done. 2013-12-29 13:06:23 -04:00
View.hs fix some mixed space+tab indentation 2014-10-09 15:09:11 -04:00
Wanted.hs fix transfers of key with no associated file 2014-01-23 16:44:02 -04:00