steffen-dotfiles/gitconfig

[include]
  path = ~/.gitconfig.user

[core]
  excludesfile = ~/.gitignore
  autocrlf = input
  eol = lf
  pager = diff-so-fancy | less --tabs=2 -RFX

[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]
  git = !git
  cl = clean -f -d
  st = status
  cm = commit
  co = checkout
  br = branch -a
  ps = push
  pl = pull
  mg = merge
  ffs = flow feature start
  fff = flow feature finish
  ffp = flow feature publish
  fi = flow init
  rs = reset HEAD --hard
  hist = log --pretty=format:\"%h | %ad | %an | %s%d \" --graph --date=local
  l = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(blue)<%an>%Creset' --abbrev-commit
  lo = log --graph --decorate --pretty=oneline --abbrev-commit --all
  pu = !"git fetch origin -v; git fetch upstream -v; git merge upstream/master"

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

[mergetool]
  prompt = false
  keepBackup = false

[push]
  default = simple

[interactive]
  diffFilter = diff-highlight
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`
Add gitconfig for diff-so-fancy 2016-07-28 08:54:55 +00:00			`pager = diff-so-fancy \| less --tabs=2 -RFX`
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]`
some minor changes and submodule updates 2013-05-11 20:26:43 +00:00			`git = !git`
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			`st = status`
			`cm = commit`
			`co = checkout`
minor bash prompt update + git branch alias 2012-07-10 17:00:11 +00:00			`br = branch -a`
updated git config, readme and added all submodules for vim 2012-05-28 15:16:38 +00:00			`ps = push`
			`pl = pull`
merge shortcut 2012-05-30 18:34:12 +00:00			`mg = merge`
some nice vim and zshrc stuff 2013-07-05 16:49:04 +00:00			`ffs = flow feature start`
			`fff = flow feature finish`
lots of install/brew/node cleanup 2014-07-18 16:30:36 +00:00			`ffp = flow feature publish`
some nice vim and zshrc stuff 2013-07-05 16:49:04 +00:00			`fi = flow init`
git stuff 2012-09-14 16:20:22 +00:00			`rs = reset HEAD --hard`
some alias fixes, no more sourcetree in gitconfig, hist-change, submodules 2012-09-05 13:32:17 +00:00			`hist = log --pretty=format:\"%h \| %ad \| %an \| %s%d \" --graph --date=local`
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`
updated git config, readme and added all submodules for vim 2012-05-28 15:16:38 +00:00			`lo = log --graph --decorate --pretty=oneline --abbrev-commit --all`
git alias for remote fetching and oh-my-zsh update 2012-10-09 17:11:42 +00:00			`pu = !"git fetch origin -v; git fetch upstream -v; git merge upstream/master"`
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`
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]`
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			`default = simple`
git 2.9 features 2016-06-15 19:30:24 +00:00
			`[interactive]`
			`diffFilter = diff-highlight`