steffen-dotfiles/gitconfig

[include]
  path = ~/.gitconfig.user

[core]
  excludesfile = ~/.gitignore
  editor = /Applications/MacVim.app/Contents/MacOS/Vim
  autocrlf = input
  eol = lf
  pager = less -FXRS -x2

[color]
  ui = auto
[color "branch"]
  current = yellow reverse
  local = yellow
  remote = green
[color "diff"]
  meta = yellow bold
  frag = magenta bold
  old = red bold
  new = green bold
  whitespace = red reverse
[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
  rbc = rebase --continue
  ffs = flow feature start
  fff = flow feature finish
  ffp = flow feature publish
  fi = flow init
  unst = reset HEAD
  hub = push origin master
  fac = push origin refac
  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(bold 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"
  type = cat-file -t
  dump = cat-file -p

[diff]
  tool = vimdiff
  guitool = vimdiff

[mergetool]
  prompt = false
  keepBackup = false

[push]
  default = simple
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`
meh blah blubb 2014-03-26 15:33:00 +00:00			`editor = /Applications/MacVim.app/Contents/MacOS/Vim`
updated git config, readme and added all submodules for vim 2012-05-28 15:16:38 +00:00			`autocrlf = input`
			`eol = lf`
2 spaces wide tabs in git-diff-view, changed mapping for { 2012-05-31 18:57:42 +00:00			`pager = less -FXRS -x2`
updated git config, readme and added all submodules for vim 2012-05-28 15:16:38 +00:00
			`[color]`
			`ui = auto`
			`[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`
			`[color "diff"]`
whitespace in gitconfig and custom zsh for vim 2012-09-11 18:08:40 +00:00			`meta = yellow bold`
			`frag = magenta bold`
updated git config, readme and added all submodules for vim 2012-05-28 15:16:38 +00:00			`old = red bold`
			`new = green bold`
			`whitespace = red reverse`
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`
rebase continue shortcut 2013-11-23 15:52:11 +00:00			`rbc = rebase --continue`
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`
various gitconfig and ignore stuff 2012-07-23 20:44:19 +00:00			`unst = reset HEAD`
updated git config, readme and added all submodules for vim 2012-05-28 15:16:38 +00:00			`hub = push origin master`
better ctrl-p behaviour + no ex-mode/man-page for vim 2012-08-06 21:07:34 +00:00			`fac = push origin refac`
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`
back to supertab, ycm ist not for me 2013-06-06 09:32:02 +00:00			`l = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold 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"`
updated git config, readme and added all submodules for vim 2012-05-28 15:16:38 +00:00			`type = cat-file -t`
			`dump = cat-file -p`
vimdiff config 2012-09-18 12:09:25 +00:00
			`[diff]`
			`tool = vimdiff`
submodules, and lot's of other stuff 2012-11-13 18:28:59 +00:00			`guitool = vimdiff`
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`