From 6d02791a659039359aba00d3797ba2b16dcf6621 Mon Sep 17 00:00:00 2001
From: Rob Watson <rob@netflux.io>
Date: Fri, 30 Jun 2023 05:12:15 +0200
Subject: [PATCH] update gitconfig and nvimrc

---
 gitconfig | 4 ++++
 nvimrc    | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/gitconfig b/gitconfig
index 0a1a5cf..bac91d2 100644
--- a/gitconfig
+++ b/gitconfig
@@ -26,6 +26,7 @@
 	cp = cherry-pick
 	cp2 = "!fn() { git cherry-pick $1~2..$1; }; fn"
 	cp3 = "!fn() { git cherry-pick $1~3..$1; }; fn"
+	cp4 = "!fn() { git cherry-pick $1~4..$1; }; fn"
 	cpls = !git cp $(git ls)
 	d = diff
 	dls = !git diff $(git branch | fzf)
@@ -43,7 +44,9 @@
 	lm = logme
 	logme = !sh -c 'git log --author=\"$(git config --get user.name)\"'
 	ls = !git branch --format '%(refname:short)' | fzf
+	mls = !git merge $(git ls)
 	mr = !git merge $(git rb)
+	mrb = mr
 	mt = merge -s recursive -X theirs
 	nb = checkout -b
 	nuke1 = reset --hard HEAD^
@@ -83,6 +86,7 @@
 	sshp = stash show -p
 	undo = reset --soft HEAD^
 	wip = !git add . && git commit -m 'WIP'
+	wt = worktree
 [user]
 	email = rob@netflux.io
 	name = Rob Watson
diff --git a/nvimrc b/nvimrc
index 56dcccf..d09b193 100644
--- a/nvimrc
+++ b/nvimrc
@@ -536,7 +536,7 @@ require 'nvim-treesitter.configs'.setup {
   ensure_installed = "all",
   highlight = {
     enable = true, 
-    disable = {"vim"},
+    disable = {"vim", "swift"},
     additional_vim_regex_highlighting = true,
   },
   incremental_selection = {