vagabond/dotfiles
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Touch up git a bit

Browse source
This commit is contained in:
Bill Niblock 2024-10-13 16:24:12 -04:00
parent 532e627b4e
commit 2acbe2aa5e
1 changed files with 10 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
git/config
View file

@ -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