diff options
Diffstat (limited to '.config')
-rw-r--r-- | .config/git/config | 22 | ||||
-rw-r--r-- | .config/git/ignore | 24 |
2 files changed, 46 insertions, 0 deletions
diff --git a/.config/git/config b/.config/git/config new file mode 100644 index 0000000..fe7f4ea --- /dev/null +++ b/.config/git/config @@ -0,0 +1,22 @@ +[alias] + graph = log --oneline --decorate --graph --all +[merge] + tool = vimdiff +[user] + email = a@farzat.xyz + name = A Farzat +[core] + bare = false +[mergetool "vimdiff"] + path = nvim +[init] + defaultBranch = master +[fetch] + prune = true +[sendemail] + smtpserver = mail.farzat.xyz + smtpuser = a@farzat.xyz + smtpencryption = tls + smtpserverport = 587 +[credential] + helper = /usr/lib/git-core/git-credential-libsecret diff --git a/.config/git/ignore b/.config/git/ignore new file mode 100644 index 0000000..e5c1053 --- /dev/null +++ b/.config/git/ignore @@ -0,0 +1,24 @@ +################################################################################ +# Vim gitignore +# Swap +[._]*.s[a-v][a-z] +!*.svg # comment out if you don't need vector files +[._]*.sw[a-p] +[._]s[a-rt-v][a-z] +[._]ss[a-gi-z] +[._]sw[a-p] + +# Session +Session.vim +Sessionx.vim + +# Temporary +.netrwhist +*~ +# Auto-generated tag files +tags +# Persistent undo +[._]*.un~ + +# Local configuration files +.vim/ |