mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
git-annex/Assistant/Threads
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
..
Committer.hs Preserve execute bits of unlocked files in v6 mode. 2016-04-14 14:47:08 -04:00
ConfigMonitor.hs improve data type 2016-01-01 15:56:24 -04:00
Cronner.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
DaemonStatus.hs update my email address and homepage url 2015-01-21 12:50:09 -04:00
Glacier.hs update my email address and homepage url 2015-01-21 12:50:09 -04:00
Merger.hs assistant: Deal with upcoming git's refusal to merge unrelated histories by default 2016-04-22 14:26:44 -04:00
MountWatcher.hs assistant: Use udisks2 dbus events to detect when disks are mounted, instead of relying on gnome/kde stuff that is not stable. 2016-01-22 16:50:08 -04:00
NetWatcher.hs Support monitoring systemd-networkd connectivity. 2015-06-02 12:51:17 -04:00
PairListener.hs removed all uses of undefined from code base 2015-04-19 00:38:29 -04:00
ProblemFixer.hs update my email address and homepage url 2015-01-21 12:50:09 -04:00
Pusher.hs update my email address and homepage url 2015-01-21 12:50:09 -04:00
RemoteControl.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
SanityChecker.hs remove 163 lines of code without changing anything except imports 2016-01-20 16:36:33 -04:00
TransferPoller.hs update my email address and homepage url 2015-01-21 12:50:09 -04:00
Transferrer.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
TransferScanner.hs reorg 2015-12-15 15:34:28 -04:00
TransferWatcher.hs update my email address and homepage url 2015-01-21 12:50:09 -04:00
Upgrader.hs use more general module 2016-04-21 14:32:42 -04:00
UpgradeWatcher.hs make programPath return FilePath not Maybe FilePath 2015-02-28 16:59:52 -04:00
Watcher.hs annex.largefiles can be configured in .gitattributes too 2016-02-02 15:18:17 -04:00
WebApp.hs remove 3 build flags 2016-01-26 08:14:57 -04:00
XMPPClient.hs make sync aware of adjusted branches 2016-02-29 15:23:08 -04:00
XMPPPusher.hs removed all uses of undefined from code base 2015-04-19 00:38:29 -04:00