CI to automate build of cargo lockfiles on different Alpine releases for git-annex aports https://gitlab.alpinelinux.org/alpine/aports/-/tree/master/community/git-annex
Find a file
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
Annex sync: When in an adjusted branch, merge changes from the original branch 2023-07-06 12:42:24 -04:00
Assistant sync: When in an adjusted branch, merge changes from the original branch 2023-07-06 12:42:24 -04:00
Backend filter out control characters in all other Messages 2023-04-11 12:58:01 -04:00
Build document how to include= a path with a space in it 2023-05-15 16:02:06 -04:00
CmdLine added git-annex satisfy 2023-06-29 15:34:53 -04:00
Command sync: When in an adjusted branch, merge changes from the original branch 2023-07-06 12:42:24 -04:00
Config use status --ignore-submodules in configureSmudgeFilter 2022-12-20 16:02:42 -04:00
Database add ContentIndentifiersCidRemoteKeyIndex 2023-06-09 15:12:33 -04:00
debian add m68k to arch lists for webapp build deps 2023-02-23 14:26:20 -04:00
doc sync: When in an adjusted branch, merge changes from the original branch 2023-07-06 12:42:24 -04:00
Git Fix breakage when git is configured with safe.bareRepository = explicit 2023-07-05 14:43:14 -04:00
Limit new matching options --want-get-by and --want-drop-by 2022-07-28 13:26:03 -04:00
Logs sync: use log to track adjusted branch needs updating 2023-06-08 14:35:41 -04:00
Messages factor out maybeAddJSONField 2023-05-08 16:15:41 -04:00
P2P filter out control characters in error messages 2023-04-10 13:50:51 -04:00
Remote fix build warnings 2023-06-21 13:06:11 -04:00
RemoteDaemon filter out control characters in error messages 2023-04-10 13:50:51 -04:00
standalone Revert "Removed the vendored git-lfs and the GitLfs build flag" 2023-01-04 17:33:29 -04:00
static
templates Apply codespell -w throughout 2023-03-17 15:14:58 -04:00
Test add test summary with number of parts and time 2023-05-18 11:20:27 -04:00
Types implement importChanges optimisaton (not used yet) 2023-05-31 16:01:34 -04:00
Upgrade filter out control characters in all other Messages 2023-04-11 12:58:01 -04:00
Utility build git trees using ContentIdentifier to speed up import 2023-05-31 12:46:54 -04:00
.appveyor.yml update appveyor config 2023-03-22 01:02:26 -04:00
.codespellrc keyspell ignore tmp directory 2023-03-17 15:21:31 -04:00
.ghci turn of PackageImports in cabal file 2022-02-25 13:16:36 -04:00
.gitattributes
.gitignore ignore git-annex-build-deps files from dpkg-genbuilddeps 2023-01-29 11:29:51 -04:00
.mailmap
Annex.hs cache negative lookups of global numcopies and mincopies 2023-06-06 14:43:25 -04:00
Assistant.hs assistant: Fix a crash on startup by avoiding using forkProcess 2021-05-12 15:08:03 -04:00
Backend.hs filter out control characters in warning messages 2023-04-10 15:55:44 -04:00
bash-completion.bash
Benchmark.hs --size-limit exit 101 2021-06-04 16:43:47 -04:00
BuildFlags.hs show when build with Benchmark build flag 2022-08-29 14:55:58 -04:00
BuildInfo.hs
CHANGELOG importfeed: Add feedurl to the metadata 2023-07-06 00:11:38 -04:00
CmdLine.hs Adapt code to optparse-applicative 0.18.1 and later. 2023-06-21 11:51:04 -04:00
Command.hs uninit: Support --json and --json-error-messages 2023-05-11 13:43:02 -04:00
Common.hs Windows: Support long filenames in more (possibly all) of the code 2023-03-01 15:55:58 -04:00
Config.hs added an optional cost= configuration to all special remotes 2023-01-12 13:42:28 -04:00
COPYRIGHT general copyright year bump 2023-01-09 15:05:27 -04:00
Creds.hs filter out control characters in all other Messages 2023-04-11 12:58:01 -04:00
Crypto.hs filter out control characters in error messages 2023-04-10 13:50:51 -04:00
git-annex.cabal added git-annex satisfy 2023-06-29 15:34:53 -04:00
git-annex.hs sanitize control characters in main thread fatal exceptions 2023-04-12 14:21:53 -04:00
git-union-merge.hs
Git.hs filter out control characters in error messages 2023-04-10 13:50:51 -04:00
Key.hs convert Key to ShortByteString 2021-10-05 20:20:08 -04:00
Limit.hs filter out control characters in error messages 2023-04-10 13:50:51 -04:00
Logs.hs filter-branch working aside from some edge cases 2021-05-17 13:24:58 -04:00
Makefile clean up cabal.project.local~* 2023-04-11 13:18:31 -04:00
Messages.hs factor out maybeAddJSONField 2023-05-08 16:15:41 -04:00
NEWS prep release 2023-06-26 10:41:36 -04:00
README improve description 2022-01-06 12:24:27 -04:00
Remote.hs fix suggestion to use enableremote 2023-07-02 15:01:02 -04:00
Setup.hs
stack.yaml Revert "stack.yaml: Update to lts-19.33 and aws-0.24" 2023-02-20 15:15:06 -04:00
Test.hs improve test descriptions 2023-05-30 16:11:29 -04:00
Types.hs plumb VerifyConfig into retrieveKeyFile 2021-08-17 12:43:13 -04:00
Upgrade.hs handle upgrading repositories initialized with --version=9 2022-09-26 12:59:51 -04:00

git-annex allows managing large files with git, without storing the file
contents in git. It can sync, backup, and archive your data, offline
and online. Checksums and encryption keep your data safe and secure. Bring
the power and distributed nature of git to bear on your large files with
git-annex.

For documentation, see doc/ or <https://git-annex.branchable.com/>