git-annex/Annex
Joey Hess b9e4e2ba84
new method for merging changes into adjusted branch that avoids unncessary merge conflicts
Still needs work when there are actual merge conflicts.
2016-04-06 15:36:18 -04:00
..
Branch Unneded constraint 2016-01-28 12:34:07 -04:00
Content remove 163 lines of code without changing anything except imports 2016-01-20 16:36:33 -04:00
LockPool clarify 2016-03-01 16:22:47 -04:00
MetaData update my email address and homepage url 2015-01-21 12:50:09 -04:00
View remove 163 lines of code without changing anything except imports 2016-01-20 16:36:33 -04:00
Action.hs remove 163 lines of code without changing anything except imports 2016-01-20 16:36:33 -04:00
AdjustedBranch.hs new method for merging changes into adjusted branch that avoids unncessary merge conflicts 2016-04-06 15:36:18 -04:00
AutoMerge.hs remove 163 lines of code without changing anything except imports 2016-01-20 16:36:33 -04:00
BloomFilter.hs Another redundant constraint 2016-01-28 12:34:07 -04:00
Branch.hs new method for merging changes into adjusted branch that avoids unncessary merge conflicts 2016-04-06 15:36:18 -04:00
BranchState.hs remove 163 lines of code without changing anything except imports 2016-01-20 16:36:33 -04:00
CatFile.hs add catCommit 2016-02-25 15:34:46 -04:00
CheckAttr.hs annex.largefiles can be configured in .gitattributes too 2016-02-02 15:18:17 -04:00
CheckIgnore.hs remove 163 lines of code without changing anything except imports 2016-01-20 16:36:33 -04:00
Common.hs remove 163 lines of code without changing anything except imports 2016-01-20 16:36:33 -04:00
Concurrent.hs Sped up git-annex add in direct mode and v6 by using git hash-object --batch. 2016-03-14 15:58:46 -04:00
Content.hs refactor 2016-03-09 13:43:22 -04:00
Difference.hs remove 163 lines of code without changing anything except imports 2016-01-20 16:36:33 -04:00
Direct.hs new method for merging changes into adjusted branch that avoids unncessary merge conflicts 2016-04-06 15:36:18 -04:00
DirHashes.hs a few hlints 2015-04-11 00:10:34 -04:00
Drop.hs add the known associated file to the list of others 2016-01-26 14:48:19 -04:00
Environment.hs remove 163 lines of code without changing anything except imports 2016-01-20 16:36:33 -04:00
FileMatcher.hs Include magic database in the linux and OSX standalone builds. 2016-02-26 11:54:15 -04:00
Fixup.hs init: Fix bugs in submodule .git symlink fixup, that occurred when initializing in a subdirectory of a submodule and a submodule of a submodule. 2016-02-08 15:41:27 -04:00
GitOverlay.hs new method for merging changes into adjusted branch that avoids unncessary merge conflicts 2016-04-06 15:36:18 -04:00
HashObject.hs Sped up git-annex add in direct mode and v6 by using git hash-object --batch. 2016-03-14 15:58:46 -04:00
Hook.hs remove 163 lines of code without changing anything except imports 2016-01-20 16:36:33 -04:00
Ingest.hs git annex add in adjusted unlocked branch 2016-03-29 13:26:06 -04:00
Init.hs deal with cloning a repo that has an ajdusted branch checked out 2016-04-04 13:51:42 -04:00
InodeSentinal.hs remove 163 lines of code without changing anything except imports 2016-01-20 16:36:33 -04:00
Journal.hs remove 163 lines of code without changing anything except imports 2016-01-20 16:36:33 -04:00
Link.hs v6: Close pointer file handles more quickly, to avoid problems on Windows. 2016-04-04 15:42:33 -04:00
Locations.hs new method for merging changes into adjusted branch that avoids unncessary merge conflicts 2016-04-06 15:36:18 -04:00
LockFile.hs remove 163 lines of code without changing anything except imports 2016-01-20 16:36:33 -04:00
LockPool.hs pid locking configuration and abstraction layer for git-annex 2015-11-12 17:50:34 -04:00
MakeRepo.hs Use git-annex init --version=6 to get v6 for now 2015-12-15 17:17:13 -04:00
MetaData.hs metadata: Added -r to remove all current values of a field. 2016-02-29 13:00:46 -04:00
Notification.hs remove 163 lines of code without changing anything except imports 2016-01-20 16:36:33 -04:00
NumCopies.hs remove 163 lines of code without changing anything except imports 2016-01-20 16:36:33 -04:00
Path.hs Fix bug introduced in the last release that broke git-annex sync when git-annex was installed from the standalone tarball. 2015-03-27 12:55:18 -04:00
Perms.hs refactor 2016-03-09 13:43:22 -04:00
Queue.hs remove 163 lines of code without changing anything except imports 2016-01-20 16:36:33 -04:00
Quvi.hs remove 163 lines of code without changing anything except imports 2016-01-20 16:36:33 -04:00
ReplaceFile.hs remove 163 lines of code without changing anything except imports 2016-01-20 16:36:33 -04:00
SpecialRemote.hs remove 163 lines of code without changing anything except imports 2016-01-20 16:36:33 -04:00
Ssh.hs refactor 2016-02-25 13:46:31 -04:00
TaggedPush.hs remove 163 lines of code without changing anything except imports 2016-01-20 16:36:33 -04:00
Transfer.hs more windows build fix 2016-02-15 15:03:44 -04:00
Url.hs remove 163 lines of code without changing anything except imports 2016-01-20 16:36:33 -04:00
UUID.hs optimise getUUID 2016-01-20 16:55:06 -04:00
VariantFile.hs remove 163 lines of code without changing anything except imports 2016-01-20 16:36:33 -04:00
Version.hs limit git annex adjust to v6 mode 2016-03-29 12:05:02 -04:00
View.hs new method for merging changes into adjusted branch that avoids unncessary merge conflicts 2016-04-06 15:36:18 -04:00
Wanted.hs remove 163 lines of code without changing anything except imports 2016-01-20 16:36:33 -04:00
WorkTree.hs remove 163 lines of code without changing anything except imports 2016-01-20 16:36:33 -04:00