mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
git-annex/Assistant
History
Joey Hess 240bae38f6
sync: When in an adjusted branch, merge changes from the original branch 
This causes changes to the original branch to get merged with a single
sync. Before, it took 2 syncs; the first happened to update the synced/
branch, and the second merged changes from the synced/ branch into the
ajusted branch.

Using mergeToAdjustedBranch when tomerge == origbranch is probably
overkill, but it does work fine.

Sponsored-By: the NIH-funded NICEMAN (ReproNim TR&D3) project
2023-07-06 12:42:24 -04:00
..
Alert Apply codespell -w throughout 2023-03-17 15:14:58 -04:00
Install fix build on OSX 2023-03-03 13:20:49 -04:00
Pairing filter out control characters in error messages 2023-04-10 13:50:51 -04:00
Threads sync: When in an adjusted branch, merge changes from the original branch 2023-07-06 12:42:24 -04:00
Types Apply codespell -w throughout 2023-03-17 15:14:58 -04:00
WebApp filter out control characters in error messages 2023-04-10 13:50:51 -04:00
Alert.hs update licenses from GPL to AGPL 2019-03-13 15:48:14 -04:00
BranchChange.hs update licenses from GPL to AGPL 2019-03-13 15:48:14 -04:00
Changes.hs update licenses from GPL to AGPL 2019-03-13 15:48:14 -04:00
Commits.hs update licenses from GPL to AGPL 2019-03-13 15:48:14 -04:00
Common.hs use fastDebug everywhere it can be used 2021-04-06 15:41:24 -04:00
CredPairCache.hs update licenses from GPL to AGPL 2019-03-13 15:48:14 -04:00
DaemonStatus.hs switch from hslogger to purpose-built Utility.Debug 2021-04-05 13:40:31 -04:00
DeleteRemote.hs filter out control characters in error messages 2023-04-10 13:50:51 -04:00
Drop.hs add SeekInput (not yet used) 2020-09-15 15:41:13 -04:00
Fsck.hs update licenses from GPL to AGPL 2019-03-13 15:48:14 -04:00
Gpg.hs be stricter about rejecting invalid configurations for remotes 2020-01-10 14:52:48 -04:00
Install.hs Windows: Support long filenames in more (possibly all) of the code 2023-03-01 15:55:58 -04:00
MakeRemote.hs filter out control characters in error messages 2023-04-10 13:50:51 -04:00
MakeRepo.hs filter out control characters in error messages 2023-04-10 13:50:51 -04:00
Monad.hs turn of PackageImports in cabal file 2022-02-25 13:16:36 -04:00
NamedThread.hs update licenses from GPL to AGPL 2019-03-13 15:48:14 -04:00
Pairing.hs update licenses from GPL to AGPL 2019-03-13 15:48:14 -04:00
Pushes.hs update licenses from GPL to AGPL 2019-03-13 15:48:14 -04:00
RemoteControl.hs update licenses from GPL to AGPL 2019-03-13 15:48:14 -04:00
Repair.hs switch from hslogger to purpose-built Utility.Debug 2021-04-05 13:40:31 -04:00
RepoProblem.hs update licenses from GPL to AGPL 2019-03-13 15:48:14 -04:00
Restart.hs Windows: Support urls like "file:///c:/path" 2023-03-27 13:38:02 -04:00
ScanRemotes.hs update licenses from GPL to AGPL 2019-03-13 15:48:14 -04:00
Ssh.hs filter out control characters in error messages 2023-04-10 13:50:51 -04:00
Sync.hs Apply codespell -w throughout 2023-03-17 15:14:58 -04:00
TransferQueue.hs git style filename quoting controlled by core.quotePath 2023-04-08 14:52:26 -04:00
TransferSlots.hs git style filename quoting controlled by core.quotePath 2023-04-08 14:52:26 -04:00
Unused.hs Apply codespell -w throughout 2023-03-17 15:14:58 -04:00
Upgrade.hs filter out control characters in error messages 2023-04-10 13:50:51 -04:00
WebApp.hs unified AuthToken type between webapp and tor 2016-11-22 14:18:34 -04:00