mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
git-annex/Assistant/Threads
History
Joey Hess 556b2ded2b
sync: Pass --allow-unrelated-histories to git merge when used with git git 2.9.0 or newer. 
This makes merging a remote into a freshly created direct mode repository
work the same as it works in indirect mode.

The git-annex branches would get merged in any case by a sync,
since that doesn't use git merge.

This might need to be revisited later to better mirror git's behavior.
2016-11-15 18:26:17 -04:00
..
Committer.hs get, move, copy, mirror: Added --failed switch which retries failed copies/moves 2016-08-03 12:37:12 -04:00
ConfigMonitor.hs improve data type 2016-01-01 15:56:24 -04:00
Cronner.hs get, move, copy, mirror: Added --failed switch which retries failed copies/moves 2016-08-03 12:37:12 -04:00
DaemonStatus.hs update my email address and homepage url 2015-01-21 12:50:09 -04:00
Glacier.hs get, move, copy, mirror: Added --failed switch which retries failed copies/moves 2016-08-03 12:37:12 -04:00
Merger.hs sync: Pass --allow-unrelated-histories to git merge when used with git git 2.9.0 or newer. 2016-11-15 18:26:17 -04:00
MountWatcher.hs only warn about missing dbus support on linux 2016-05-24 16:51:10 -04:00
NetWatcher.hs Support monitoring systemd-networkd connectivity. 2015-06-02 12:51:17 -04:00
PairListener.hs switch away from deprecated recvFrom 2016-09-05 12:10:24 -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 get, move, copy, mirror: Added --failed switch which retries failed copies/moves 2016-08-03 12:37:12 -04:00
TransferPoller.hs get, move, copy, mirror: Added --failed switch which retries failed copies/moves 2016-08-03 12:37:12 -04:00
Transferrer.hs get, move, copy, mirror: Added --failed switch which retries failed copies/moves 2016-08-03 12:37:12 -04:00
TransferScanner.hs get, move, copy, mirror: Added --failed switch which retries failed copies/moves 2016-08-03 12:37:12 -04:00
TransferWatcher.hs get, move, copy, mirror: Added --failed switch which retries failed copies/moves 2016-08-03 12:37:12 -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 assistant: Fix bug that caused v6 pointer files to be annexed by the assistant. 2016-05-16 13:36:36 -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