mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
git-annex/Assistant
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
..
Alert remove 163 lines of code without changing anything except imports 2016-01-20 16:36:33 -04:00
Install 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
Pairing basic gitlab support in webapp 2015-07-22 17:50:13 -04:00
Threads assistant: Deal with upcoming git's refusal to merge unrelated histories by default 2016-04-22 14:26:44 -04:00
Types remove 163 lines of code without changing anything except imports 2016-01-20 16:36:33 -04:00
WebApp Merge branch 'master' into adjustedbranch 2016-03-11 12:21:26 -04:00
XMPP update sync branch to the orig branch when in adjusted branch 2016-02-29 16:57:42 -04:00
Alert.hs remove 163 lines of code without changing anything except imports 2016-01-20 16:36:33 -04:00
BranchChange.hs update my email address and homepage url 2015-01-21 12:50:09 -04:00
Changes.hs update my email address and homepage url 2015-01-21 12:50:09 -04:00
Commits.hs update my email address and homepage url 2015-01-21 12:50:09 -04:00
Common.hs remove 163 lines of code without changing anything except imports 2016-01-20 16:36:33 -04:00
CredPairCache.hs update my email address and homepage url 2015-01-21 12:50:09 -04:00
DaemonStatus.hs support time-1.5.0 2015-05-10 15:21:35 -04:00
DeleteRemote.hs update my email address and homepage url 2015-01-21 12:50:09 -04:00
Drop.hs add VerifiedCopy data type 2015-10-08 16:55:11 -04:00
Fsck.hs update my email address and homepage url 2015-01-21 12:50:09 -04:00
Gpg.hs support gpg.program 2015-09-09 18:06:49 -04:00
Install.hs Improve integration with KDE's file manager to work with dolphin version 14.12.3 while still being compatable with 4.14.2. Thanks, silvio. 2015-04-29 15:53:16 -04:00
MakeRemote.hs Special remotes configured with autoenable=true will be automatically enabled when git-annex init is run. 2015-09-14 14:49:48 -04:00
Monad.hs remove 163 lines of code without changing anything except imports 2016-01-20 16:36:33 -04:00
NamedThread.hs remove 163 lines of code without changing anything except imports 2016-01-20 16:36:33 -04:00
NetMessager.hs update my email address and homepage url 2015-01-21 12:50:09 -04:00
Pairing.hs remove 163 lines of code without changing anything except imports 2016-01-20 16:36:33 -04:00
Pushes.hs update my email address and homepage url 2015-01-21 12:50:09 -04:00
RemoteControl.hs update my email address and homepage url 2015-01-21 12:50:09 -04:00
Repair.hs When re-execing git-annex, use current program location, rather than ~/.config/git-annex/program, when possible. 2015-02-28 17:23:13 -04:00
RepoProblem.hs update my email address and homepage url 2015-01-21 12:50:09 -04:00
Restart.hs When re-execing git-annex, use current program location, rather than ~/.config/git-annex/program, when possible. 2015-02-28 17:23:13 -04:00
ScanRemotes.hs update my email address and homepage url 2015-01-21 12:50:09 -04:00
Ssh.hs remove 163 lines of code without changing anything except imports 2016-01-20 16:36:33 -04:00
Sync.hs assistant: Deal with upcoming git's refusal to merge unrelated histories by default 2016-04-22 14:26:44 -04:00
TransferQueue.hs update my email address and homepage url 2015-01-21 12:50:09 -04:00
TransferrerPool.hs update my email address and homepage url 2015-01-21 12:50:09 -04:00
TransferSlots.hs support invalidating existing VerifiedCopys 2015-10-08 17:58:32 -04:00
Unused.hs remove 163 lines of code without changing anything except imports 2016-01-20 16:36:33 -04:00
Upgrade.hs fix local dropping to not require extra locking of copies, but only that the local copy be locked for removal 2015-10-09 15:48:02 -04:00
WebApp.hs update my email address and homepage url 2015-01-21 12:50:09 -04:00
XMPP.hs remaining dataenc to sandi conversions 2015-05-07 18:07:13 -04:00