From 2b726ab43df544d99a56e3290f4f1ef9d3f506cb Mon Sep 17 00:00:00 2001 From: Curtis McEnroe Date: Fri, 6 Nov 2015 15:46:02 -0500 Subject: Clean up git configs --- .gitconfig | 18 ++++++++---------- .gitignore.global | 6 ++---- 2 files changed, 10 insertions(+), 14 deletions(-) diff --git a/.gitconfig b/.gitconfig index 971dfba6..e3e82bf6 100644 --- a/.gitconfig +++ b/.gitconfig @@ -5,20 +5,18 @@ editor = vim excludesfile = ~/.gitignore.global autocrlf = input +[push] + default = simple +[help] + autocorrect = 1 +[color] + ui = true [sendemail] smtpencryption = tls smtpserver = smtp.gmail.com smtpuser = programble@gmail.com smtpserverport = 587 -[merge] - tool = vimdiff -[color] - ui = true -[push] - default = simple -[include] - path = .gitconfig.private [github] user = programble -[help] - autocorrect = 1 +[include] + path = .gitconfig.private diff --git a/.gitignore.global b/.gitignore.global index 291277d6..dd7a59be 100644 --- a/.gitignore.global +++ b/.gitignore.global @@ -1,6 +1,4 @@ *~ -*.swp -*.swo -.pult -.pultrc +.*.sw? *.DS_store +.pult* -- cgit 1.4.1