From 2acbe2aa5ee76481fe8973edcee768ecb451b1b6 Mon Sep 17 00:00:00 2001 From: Bill Niblock Date: Sun, 13 Oct 2024 16:24:12 -0400 Subject: [PATCH] Touch up git a bit --- git/config | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/git/config b/git/config index 4d22f1e..2a7d664 100644 --- a/git/config +++ b/git/config @@ -1,17 +1,16 @@ -#==========================# -# Global Git Configuration # -#==========================# +#==============================================================================# +#= Global Git Configuration =# +#==============================================================================# [config] -relativePaths=false # Show relative paths with status outputs +relativePaths=false # Show relative paths with status outputs [init] -defaultBranch=main # Default branch is 'main' not 'master' +defaultBranch=main # Default branch is 'main' not 'master' [diff] -algorithm=histogram # Better-sorted output of diffs +algorithm=histogram # Better-sorted output of diffs [merge] -conflictstyle=diff3 # Use the diff3 merge output -[user] # Default credentials: -name="Bill Niblock" # My name +conflictstyle=diff3 # Use the diff3 merge output +[user] # Default credentials: +name="Bill Niblock" # My name email="bill@theinternetvagabond.com" # My email address [includeIf "gitdir:~/Code/nibtech/"] # Over-ride with NibTech credentials -path="~/.config/git/nibtech.conf" # Path to NibTech config file -# another thing! +path="~/.config/git/nibtech.conf" # Path to NibTech config file