mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
git-annex/Git
History
Joey Hess 46e3319995
assistant: Deal with upcoming git's refusal to merge unrelated histories by default 
git 2.8.1 (or perhaps 2.9.0) is going to prevent git merge from merging in
unrelated branches. Since the webapp's pairing etc features often combine
together repositories with unrelated histories, work around this behavior
change by setting GIT_MERGE_ALLOW_UNRELATED_HISTORIES when the assistant
merges.

Note though that this is not done for git annex sync's merges, so
it will follow git's default or configured behavior.
2016-04-22 14:26:44 -04:00
..
Command update my email address and homepage url 2015-01-21 12:50:09 -04:00
Remote desc 2015-04-19 08:18:17 -04:00
AutoCorrect.hs update my email address and homepage url 2015-01-21 12:50:09 -04:00
Branch.hs sync: Show output of git commit. 2016-04-05 16:22:21 -04:00
BuildVersion.hs update my email address and homepage url 2015-01-21 12:50:09 -04:00
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 avoid withWorkTreeRelated affecting annex symlink calculation 2016-04-08 14:24:00 -04:00
Config.hs Submodules are now supported by git-annex! 2015-03-02 16:43:44 -04:00
Construct.hs avoid withWorkTreeRelated affecting annex symlink calculation 2016-04-08 14:24:00 -04:00
CurrentRepo.hs avoid unncessary IO 2015-02-12 15:33:44 -04:00
DiffTree.hs fix warning 2016-03-11 14:33:38 -04:00
DiffTreeItem.hs update my email address and homepage url 2015-01-21 12:50:09 -04:00
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 update my email address and homepage url 2015-01-21 12:50:09 -04:00
GCrypt.hs update my email address and homepage url 2015-01-21 12:50:09 -04:00
HashObject.hs update my email address and homepage url 2015-01-21 12:50:09 -04:00
Hook.hs Switched to using git for Windows, rather than msysgit. 2015-09-10 19:16:30 -04:00
Index.hs update my email address and homepage url 2015-01-21 12:50:09 -04:00
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 assistant: Deal with upcoming git's refusal to merge unrelated histories by default 2016-04-22 14:26:44 -04:00
Objects.hs update my email address and homepage url 2015-01-21 12:50:09 -04:00
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 update my email address and homepage url 2015-01-21 12:50:09 -04:00
Repair.hs improve data type 2016-01-01 15:56:24 -04:00
Sha.hs update my email address and homepage url 2015-01-21 12:50:09 -04:00
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 fix build with ghc 7.6.3 2016-04-08 16:09:00 -04:00
Types.hs avoid withWorkTreeRelated affecting annex symlink calculation 2016-04-08 14:24:00 -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 update my email address and homepage url 2015-01-21 12:50:09 -04:00
Url.hs update my email address and homepage url 2015-01-21 12:50:09 -04:00
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