git-annex/Git
Joey Hess 887ef93a7f
run out of tree merge with --no-ff
This is how direct mode does it too, and somehow, for reasons that
currently escape me, this makes git merge not care if it's run with an
empty work tree.
2016-04-06 18:40:28 -04:00
..
Command
Remote
AutoCorrect.hs
Branch.hs sync: Show output of git commit. 2016-04-05 16:22:21 -04:00
BuildVersion.hs
CatFile.hs fix parsing of commit with no parents 2016-03-31 17:12:01 -04:00
CheckAttr.hs fix handling of unspecified attributes (particularly for annex.largefiles) 2016-02-05 18:41:23 -04:00
CheckIgnore.hs work around git check-ignore --batch bad exit status bug, and bring back import -J 2015-11-06 15:39:51 -04:00
Command.hs
Config.hs
Construct.hs Catch up with current git behavior when both repo and repo.git exist; it seems it now prefers repo in this case, although historically it may have preferred repo.git. 2015-10-26 15:35:55 -04:00
CurrentRepo.hs
DiffTree.hs fix warning 2016-03-11 14:33:38 -04:00
DiffTreeItem.hs
Env.hs fix android build 2016-02-29 11:43:22 -04:00
FileMode.hs fix various build warnings, mostly on Windows 2015-10-13 13:24:44 -04:00
Filename.hs fix use of hifalutin terminology 2015-11-16 14:37:31 -04:00
FilePath.hs improve propigation of commits from adjusted branches 2016-03-11 16:05:06 -04:00
Fsck.hs
GCrypt.hs
HashObject.hs
Hook.hs Switched to using git for Windows, rather than msysgit. 2015-09-10 19:16:30 -04:00
Index.hs
LockFile.hs replicate git's message about an existing lock file 2016-03-03 13:06:39 -04:00
LsFiles.hs remove Params constructor from Utility.SafeCommand 2015-06-01 13:52:23 -04:00
LsTree.hs forgot to use sfile 2016-02-26 16:12:40 -04:00
Merge.hs run out of tree merge with --no-ff 2016-04-06 18:40:28 -04:00
Objects.hs
Queue.hs immediate queue flushing when annex.queuesize=1 2016-01-13 14:55:01 -04:00
Ref.hs Upgrading a direct mode repository to v6 has changed to enter an adjusted unlocked branch. 2016-04-04 13:17:24 -04:00
RefLog.hs Only look at reflogs for relevant branches, not for git-annex branches 2015-07-07 17:36:30 -04:00
Remote.hs
Repair.hs improve data type 2016-01-01 15:56:24 -04:00
Sha.hs
SharedRepository.hs Support git's undocumented core.sharedRepository=2 value, which is equivilant to "world". 2015-07-06 15:33:44 -04:00
Status.hs status: Show added but not yet committed files. 2015-09-22 17:32:28 -04:00
Tree.hs grafting new items into existing tree 2016-03-11 19:29:43 -04:00
Types.hs extract commit parent(s) 2016-03-11 12:47:14 -04:00
UnionMerge.hs Sped up git-annex merge by using git hash-object --batch. 2016-03-14 16:23:22 -04:00
UpdateIndex.hs
Url.hs
Version.hs more {-# OPTIONS_GHC -fno-warn-tabs #-} ... Forcing people who have what is merely a difference of opinion to you to do this is a bit of an asshole move. Just saying. 2015-05-10 16:38:49 -04:00