diff options
| author | Sean Whitton <spwhitton@spwhitton.name> | 2015-12-28 11:30:32 +0000 |
|---|---|---|
| committer | Sean Whitton <spwhitton@spwhitton.name> | 2020-01-12 12:28:26 +0000 |
| commit | 1b88290b8a0d881244c8d4ddc79c4ac38fcd83e0 (patch) | |
| tree | a83652e7b2d2fb2538dc872970c4a046a475172f | |
| parent | dd8b559db50c10f1dd4cbe9536cc02b900ea3b56 (diff) | |
| download | dotfiles-1b88290b8a0d881244c8d4ddc79c4ac38fcd83e0.tar.gz | |
minimal annex content syncs from zephyr
Poor connection atm
| -rw-r--r-- | .mrconfig.in | 3 | ||||
| -rwxr-xr-x | archive/bin/coldbkup | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/.mrconfig.in b/.mrconfig.in index 7d59096d..5f481964 100644 --- a/.mrconfig.in +++ b/.mrconfig.in @@ -404,7 +404,8 @@ skip = ! workstation update = git annex sync --no-content origin # disabled because required yubikey # sync = git annex sync --no-content origin -push = git annex sync --content origin athena +# minimal sync over zephyr's poor connection +push = git annex copy -t origin --not --copies=client:2 doc; git annex sync --no-content origin fixups = git config push.default matching git config remote.origin.gcrypt-publish-participants true diff --git a/archive/bin/coldbkup b/archive/bin/coldbkup index a98b2936..4435220c 100755 --- a/archive/bin/coldbkup +++ b/archive/bin/coldbkup @@ -24,7 +24,9 @@ if mount | grep -q "/media/${USER}/m3"; then # we sync both ma and m3 here so that ma knows everything that got # put onto m3 cd $HOME/lib/annex - git annex sync --content origin m3 + # don't try to sync ma and origin content from zephyr's poor connection + git annex sync --content m3 + git annex sync origin m3 cd $HOME/lib/wikiannex git annex sync --content origin athena m3 # TODO |