14b2a5152bea

Merge
[view raw] [browse files]
author Steve Losh <steve@stevelosh.com>
date Thu, 18 Jul 2024 10:09:41 -0400
parents 8e22b36e5cba
children 6c4c335faf47
branches/tags (none)
files gitconfig vim/custom-dictionary.utf-8.add

Changes

--- 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
--- 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