#==============================================================================# #= Global Git Configuration =# #==============================================================================# [config] relativePaths=false # Show relative paths with status outputs [init] defaultBranch=main # Default branch is 'main' not 'master' [diff] algorithm=histogram # Better-sorted output of diffs [merge] 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