From a80c03f4b65e15262318ba229eb55a0519e9d7a8 Mon Sep 17 00:00:00 2001
From: Tom Ryder <tom@sanctum.geek.nz>
Date: Mon, 14 Sep 2020 14:29:34 +1200
Subject: Correct and extend 'backupskip' patterns for .git

---
 vim/vimrc | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

(limited to 'vim')

diff --git a/vim/vimrc b/vim/vimrc
index ef02a401..e9e940c2 100644
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -2,7 +2,7 @@
 "  Tom Ryder (tejr)’s Literate Vimrc
 " ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
 "
-" Last updated: Sat, 12 Sep 2020 05:21:43 UTC
+" Last updated: Mon, 14 Sep 2020 02:28:57 UTC
 "
 " │ And I was lifted up in heart, and thought
 " │ Of all my late-shown prowess in the lists,
@@ -273,12 +273,14 @@ if has#('unix')
   set backupskip+=/usr/tmp/*,/var/tmp/*
 
   " Per-repository temporary files for Git
-  "" Commit messages
-  set backupskip+=*.git/*_EDITMSG
-  "" Patch edits
-  set backupskip+=*.git/ADD_EDIT.patch
+  "" Commit and tag messages
+  set backupskip+=*/*.git/?*_EDITMSG
+  "" Edited patches
+  set backupskip+=*/*.git/ADD_EDIT.patch
+  "" Email messages
+  set backupskip+=*/*.git/.gitsendemail.msg.*
   "" Interactive rebase manifests
-  set backupskip+=*.git/rebase-merge/git-rebase-todo
+  set backupskip+=*/*.git/rebase-merge/git-rebase-todo
 
   " systemd user manager unit files
   "" Full unit files
-- 
cgit v1.2.3