steffen-dotfiles/.gitconfig

[include]
  path = ~/.gitconfig.user

[core]
  excludesfile = ~/.gitignore
  autocrlf = input
  eol = lf
  pager = delta

[color]
  ui = auto

[color "branch"]
  current = yellow reverse
  local = yellow
  remote = green

[color "diff"]
  meta = yellow
  commit = green
  frag = magenta
  old = red
  new = green
  whitespace = red reverse

[color "diff-highlight"]
  newNormal = green
  newHighlight = green 22
  oldNormal = red
  oldHighlight = red 52

[color "status"]
  added = yellow
  changed = green
  untracked = cyan

[alias]
  a = add
  b = branch
  br = branch -a
  c = checkout
  cl = clean -f -d
  cm = commit
  co = checkout
  cp = cherry-pick
  d = diff
  fame = shortlog -sn --all --no-merges
  git = !git
  l = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(blue)<%an>%Creset' --abbrev-commit
  m = merge
  mg = merge
  pl = pull
  ps = push
  rs = reset HEAD --hard
  s = status
  st = status

[diff]
  tool = nvim -d
  guitool = nvim -d
  compactionHeuristic = true
  colorMoved = default

[merge]
  conflictstyle = diff3

[mergetool]
  prompt = false
  keepBackup = false

[push]
  default = current

[pull]
  rebase = false

[interactive]
  diffFilter = delta --color-only

[credential]
  helper = store

[delta]
  blame-code-style = syntax
  blame-format = "{author:>18} ({commit:>8}) {timestamp:<13} "
  commit-decoration-style = normal box
  dark = true
  file-added-label = [+]
  file-copied-label = [==]
  file-modified-label = [*]
  file-removed-label = [-]
  file-renamed-label = [->]
  hunk-header-style = omit
  hyperlinks = false
  inline-hint-style = syntax
  line-numbers = true
  line-numbers-left-format = " {nm:>3} │"
  line-numbers-right-format = " {np:>3} │"
  merge-conflict-begin-symbol = ⌃
  merge-conflict-end-symbol = ⌄
  merge-conflict-ours-diff-header-decoration-style = ''
  merge-conflict-theirs-diff-header-decoration-style = ''
  minus-non-emph-style = syntax auto
  navigate = true
  plus-non-emph-style = syntax auto
  side-by-side = true
  syntax-theme = gruvbox-material
  width = "-4"

[init]
  defaultBranch = main
updated git config, readme and added all submodules for vim 2012-05-28 15:16:38 +00:00			`[include]`
fixed issue with macvim / zsh -- an additional sudo mv /etc/zshenv /etc/zprofile helped 2012-09-11 17:08:35 +00:00			`path = ~/.gitconfig.user`
updated git config, readme and added all submodules for vim 2012-05-28 15:16:38 +00:00
			`[core]`
			`excludesfile = ~/.gitignore`
			`autocrlf = input`
			`eol = lf`
delta vs. diff-so-fancy 2022-03-18 11:55:13 +00:00			`pager = delta`
updated git config, readme and added all submodules for vim 2012-05-28 15:16:38 +00:00
			`[color]`
			`ui = auto`
git 2.9 features 2016-06-15 19:30:24 +00:00
updated git config, readme and added all submodules for vim 2012-05-28 15:16:38 +00:00			`[color "branch"]`
whitespace in gitconfig and custom zsh for vim 2012-09-11 18:08:40 +00:00			`current = yellow reverse`
updated git config, readme and added all submodules for vim 2012-05-28 15:16:38 +00:00			`local = yellow`
			`remote = green`
git 2.9 features 2016-06-15 19:30:24 +00:00
updated git config, readme and added all submodules for vim 2012-05-28 15:16:38 +00:00			`[color "diff"]`
hyperterm config 2016-08-17 20:20:34 +00:00			`meta = yellow`
			`commit = green`
			`frag = magenta`
			`old = red`
			`new = green`
updated git config, readme and added all submodules for vim 2012-05-28 15:16:38 +00:00			`whitespace = red reverse`
git 2.9 features 2016-06-15 19:30:24 +00:00
Fix git diff colors, no bright for bold in terminal 2016-07-29 13:04:23 +00:00			`[color "diff-highlight"]`
hyperterm config 2016-08-17 20:20:34 +00:00			`newNormal = green`
			`newHighlight = green 22`
			`oldNormal = red`
			`oldHighlight = red 52`
Fix git diff colors, no bright for bold in terminal 2016-07-29 13:04:23 +00:00
whitespace in gitconfig and custom zsh for vim 2012-09-11 18:08:40 +00:00			`[color "status"]`
			`added = yellow`
			`changed = green`
updated git config, readme and added all submodules for vim 2012-05-28 15:16:38 +00:00			`untracked = cyan`

			`[alias]`
major stow rewrite 2024-07-11 10:09:38 +00:00			`a = add`
			`b = branch`
			`br = branch -a`
			`c = checkout`
install script and aliases 2014-02-01 15:07:33 +00:00			`cl = clean -f -d`
updated git config, readme and added all submodules for vim 2012-05-28 15:16:38 +00:00			`cm = commit`
			`co = checkout`
Minor fixes and better vim key-mappings 2021-07-30 15:28:28 +00:00			`cp = cherry-pick`
. 2024-07-11 12:13:51 +00:00			`d = diff`
Git aliases 2017-08-08 11:45:42 +00:00			`fame = shortlog -sn --all --no-merges`
major stow rewrite 2024-07-11 10:09:38 +00:00			`git = !git`
hyperterm config 2016-08-17 20:20:34 +00:00			`l = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(blue)<%an>%Creset' --abbrev-commit`
major stow rewrite 2024-07-11 10:09:38 +00:00			`m = merge`
			`mg = merge`
			`pl = pull`
			`ps = push`
			`rs = reset HEAD --hard`
			`s = status`
			`st = status`
vimdiff config 2012-09-18 12:09:25 +00:00
			`[diff]`
major refactoring/changes for nvim/dein/ale/fzf 2016-12-26 08:36:23 +00:00			`tool = nvim -d`
			`guitool = nvim -d`
git 2.9 features 2016-06-15 19:30:24 +00:00			`compactionHeuristic = true`
delta vs. diff-so-fancy 2022-03-18 11:55:13 +00:00			`colorMoved = default`

			`[merge]`
			`conflictstyle = diff3`
vimdiff config 2012-09-18 12:09:25 +00:00
and back to macvim now - now time atm for tmux and terminal stuff 2012-09-20 12:18:56 +00:00			`[mergetool]`
vimdiff config 2012-09-18 12:09:25 +00:00			`prompt = false`
and back to macvim now - now time atm for tmux and terminal stuff 2012-09-20 12:18:56 +00:00			`keepBackup = false`
re-add node_modules + bower_components to gitignore and remove default user from gitconfig, that should be in the gituser file 2015-05-05 11:19:51 +00:00
updates 2015-02-21 13:24:00 +00:00			`[push]`
major stow rewrite 2024-07-11 10:09:38 +00:00			`default = current`
git 2.9 features 2016-06-15 19:30:24 +00:00
¯\_(ツ)_/¯ 2020-07-08 17:27:44 +00:00			`[pull]`
			`rebase = false`

git 2.9 features 2016-06-15 19:30:24 +00:00			`[interactive]`
delta vs. diff-so-fancy 2022-03-18 11:55:13 +00:00			`diffFilter = delta --color-only`
Fix git, compiled local version, update indent-keymappings in vim (back to old ones) 2021-11-23 10:05:02 +00:00
			`[credential]`
			`helper = store`
delta vs. diff-so-fancy 2022-03-18 11:55:13 +00:00
			`[delta]`
			`blame-code-style = syntax`
major stow rewrite 2024-07-11 10:09:38 +00:00			`blame-format = "{author:>18} ({commit:>8}) {timestamp:<13} "`
			`commit-decoration-style = normal box`
			`dark = true`
			`file-added-label = [+]`
			`file-copied-label = [==]`
			`file-modified-label = [*]`
			`file-removed-label = [-]`
			`file-renamed-label = [->]`
delta vs. diff-so-fancy 2022-03-18 11:55:13 +00:00			`hunk-header-style = omit`
			`hyperlinks = false`
major stow rewrite 2024-07-11 10:09:38 +00:00			`inline-hint-style = syntax`
			`line-numbers = true`
			`line-numbers-left-format = " {nm:>3} │"`
			`line-numbers-right-format = " {np:>3} │"`
			`merge-conflict-begin-symbol = ⌃`
			`merge-conflict-end-symbol = ⌄`
			`merge-conflict-ours-diff-header-decoration-style = ''`
			`merge-conflict-theirs-diff-header-decoration-style = ''`
			`minus-non-emph-style = syntax auto`
delta vs. diff-so-fancy 2022-03-18 11:55:13 +00:00			`navigate = true`
major stow rewrite 2024-07-11 10:09:38 +00:00			`plus-non-emph-style = syntax auto`
delta vs. diff-so-fancy 2022-03-18 11:55:13 +00:00			`side-by-side = true`
. 2024-08-28 15:19:56 +00:00			`syntax-theme = gruvbox-material`
delta vs. diff-so-fancy 2022-03-18 11:55:13 +00:00			`width = "-4"`

zenmode, software and fonts 2024-04-10 09:44:43 +00:00			`[init]`
			`defaultBranch = main`