diff --git a/dots/.gitconfig b/dots/.gitconfig index 3d21f4f1..bc06dd6d 100644 --- a/dots/.gitconfig +++ b/dots/.gitconfig @@ -1,67 +1,67 @@ [user] - name = Price Hiller - email = price@orion-technologies.io - signingkey = /home/sam/.ssh/keys/id_ed25519 + name = Price Hiller + email = price@orion-technologies.io + signingkey = /home/sam/.ssh/keys/id_ed25519 [init] - defaultBranch = Development + defaultBranch = Development [core] - pager = delta - ignorecase = false + pager = delta + ignorecase = false [interactive] - diffFilter = delta --color-only --features=interactive + diffFilter = delta --color-only --features=interactive [merge] - conflictstyle = diff3 + conflictstyle = diff3 [diff] - colorMoved = default + colorMoved = default [delta] - navigate = true - features = decorations interactive + navigate = true + features = decorations interactive [delta "interactive"] - keep-plus-minus-markers = false + keep-plus-minus-markers = false [delta "decorations"] - # author: https://github.com/clnoll - commit-decoration-style = bold box ul - dark = true - file-style = omit - hunk-header-decoration-style = "#022b45" box ul - hunk-header-file-style = "#999999" - hunk-header-style = file line-number syntax - line-numbers = true - line-numbers-left-style = "#022b45" - minus-emph-style = normal "#80002a" - minus-style = normal "#330011" - plus-emph-style = syntax "#003300" - plus-style = syntax "#001a00" - syntax-theme = Solarized (dark) + # author: https://github.com/clnoll + commit-decoration-style = bold box ul + dark = true + file-style = omit + hunk-header-decoration-style = "#022b45" box ul + hunk-header-file-style = "#999999" + hunk-header-style = file line-number syntax + line-numbers = true + line-numbers-left-style = "#022b45" + minus-emph-style = normal "#80002a" + minus-style = normal "#330011" + plus-emph-style = syntax "#003300" + plus-style = syntax "#001a00" + syntax-theme = Solarized (dark) [pull] - rebase = false + rebase = false [alias] - unstage = reset HEAD -- + unstage = reset HEAD -- [push] - autoSetupRemote = true - default = current + autoSetupRemote = true + default = current [merge] - conflictstyle = diff3 + conflictstyle = diff3 [branch] - autosetupmerge = always + autosetupmerge = always [remote] - pushDefault = origin + pushDefault = origin ; Per environemnt specific setup shit [includeIf "gitdir:~/Git/SSFCU/"] - path = ~/.dot_files/git-configs/.gitconfig-ssfcu + path = ~/.dot_files/git-configs/.gitconfig-ssfcu [credential] - helper = store + helper = store [gpg] - format = ssh + format = ssh