git-annex/Annex
Joey Hess 9569d6be63
Fix bad automatic merge conflict resolution between an annexed file and a directory with the same name when in an adjusted branch.
When running in an overlay work tree, all unchanged files show as deleted,
so this code that stages deletions should not run.
2016-06-07 12:53:35 -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 Fix initialization of a bare clone of a repo that has an adjusted branch checked out. 2016-06-02 17:02:38 -04:00
AutoMerge.hs Fix bad automatic merge conflict resolution between an annexed file and a directory with the same name when in an adjusted branch. 2016-06-07 12:53:35 -04:00
BloomFilter.hs Another redundant constraint 2016-01-28 12:34:07 -04:00
Branch.hs nub transitionList to avoid ugly message after repeated transitions, and avoid redundant work for repeated ForgetDeadRemotes transitions 2016-05-18 12:26:38 -04:00
BranchState.hs remove 163 lines of code without changing anything except imports 2016-01-20 16:36:33 -04:00
CatFile.hs use indexEnv 2016-05-17 13:38:04 -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 reinject: When src file's content cannot be verified, leave it alone, instead of deleting it. 2016-04-20 13:21:56 -04:00
Difference.hs remove 163 lines of code without changing anything except imports 2016-01-20 16:36:33 -04:00
Direct.hs assistant: Deal with upcoming git's refusal to merge unrelated histories by default 2016-04-22 14:26:44 -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 avoid warnings about not exported System.Directory.isSymbolicLink 2016-04-28 15:18:11 -04:00
GitOverlay.hs withAltRepo needs a separate queue of changes 2016-06-03 13:57:00 -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 Preserve execute bits of unlocked files in v6 mode. 2016-04-14 14:47:08 -04:00
Init.hs refactor isBareRepo 2016-06-02 16:59:47 -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 Preserve execute bits of unlocked files in v6 mode. 2016-04-14 14:47:08 -04:00
Locations.hs minor typo fixes throughout 2016-06-02 11:22: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 fsck: Warn when core.sharedRepository is set and an annex object file's write bit is not set and cannot be set due to the file being owned by a different user. 2016-04-14 15:36:53 -04:00
Queue.hs withAltRepo needs a separate queue of changes 2016-06-03 13:57:00 -04:00
Quvi.hs remove 163 lines of code without changing anything except imports 2016-01-20 16:36:33 -04:00
ReplaceFile.hs Windows: Fix an over-long temp directory name. 2016-05-06 12:49:41 -04:00
SpecialRemote.hs Pass the various gnupg-options configs to gpg in several cases where they were not before. 2016-05-23 17:03:20 -04:00
Ssh.hs Fix bug that prevented annex.sshcaching=false configuration from taking effect when on a crippled filesystem. Thanks, divergentdave. 2016-04-20 14:43:43 -04:00
TaggedPush.hs remove 163 lines of code without changing anything except imports 2016-01-20 16:36:33 -04:00
Transfer.hs sync --content: Fix bug that caused transfers of files to be made to a git remote that does not have a UUID. This particularly impacted clones from gcrypt repositories. 2016-06-02 13:50:43 -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 include 3 in upgradableVersions 2016-05-24 17:13:19 -04:00
View.hs Fix crash when entering/changing view in a subdirectory of a repo that has a dotfile in its root. 2016-05-17 13:49:10 -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