# HG changeset patch
# User Steve Losh <steve@stevelosh.com>
# Date 1721311781 14400
# Node ID 14b2a5152beac25a7c5221cdcf0f3b9ca3e76741
# Parent  8e22b36e5cbadeeb9625c249306524af73a70bde
Merge

diff -r 8e22b36e5cba -r 14b2a5152bea gitconfig
--- a/gitconfig	Wed Jul 17 15:51:26 2024 -0400
+++ b/gitconfig	Thu Jul 18 10:09:41 2024 -0400
@@ -94,6 +94,7 @@
     fuom = "!sh -c 'git co $(git mainbranch) && git fo && git uo' -"
     fuum = "!sh -c 'git co $(git mainbranch) && git fu && git uu' -"
     rom =  "!sh -c 'git fo && git rebase origin/$(git mainbranch)' -"
+    jom =  "!sh -c 'git join origin $(git mainbranch)' -"
     recon =  rebase --continue
 
     addremove = !git add . && git add -u
diff -r 8e22b36e5cba -r 14b2a5152bea vim/custom-dictionary.utf-8.add
--- a/vim/custom-dictionary.utf-8.add	Wed Jul 17 15:51:26 2024 -0400
+++ b/vim/custom-dictionary.utf-8.add	Thu Jul 18 10:09:41 2024 -0400
@@ -496,3 +496,5 @@
 MinKNOW
 MinION
 deduplicate
+snakemake
+repo's