dotfiles/gitconfig at master · dajacques/dotfiles · GitHub

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
[user]
	name = David Jacques
	email = David_Jacques@cable.comcast.com
[github]
	user = dajacques
[http]
	sslVerify = false
[core]
	editor = vim
[color]
  ui = auto
  diff = auto
[color "branch"]
  current = green
  local = white bold
  remote = white bold
[color "diff"]
  meta = white bold
  frag = cyan
  old = red
  new = green
[color "status"]
  added = green
  changed = cyan
  untracked = yellow
[log]
  date = relative
[format]
  pretty = format:%C(yellow)%h⏐%C(cyan)%cn⏐%C(green)%d %Creset%s %C(red)(%ad)%n
#  pretty = format:%C(yellow)%h %C(cyan)%cn%x09%C(green)%d %Creset%f %C(red)(%ad)
[alias]
  a = !git add --all && git s
  b = branch
  bd = branch -d
  bdd = branch -D
  c = commit -m
  co = checkout
  cob = checkout -b
  com = checkout master
  comp = !git checkout master && git pull
  cor = checkout release
  d = diff
  l = !git log --max-count=35 --no-merges | column -t -s '⏐'
#  l = log --max-count=36 --no-merges
  lg = log --max-count=36 --no-merges --graph
  ll = log --graph
  m = merge
  pom = push origin master
  r = rebase
  rem = rebase master
  remi = rebase -i master
  s = status -s
  uc = reset --soft HEAD^

#  l = log --max-count=36 --graph --pretty=format:'%C(yellow)%h%x09%C(cyan bold)%cn%x09%C(green)%cr%x09%Creset%s' --no-merges
#  l = log --max-count=36 --graph --pretty=format:'%C(yellow)%h%Creset %C(cyan bold)%cn%Creset %C(green)%cr%Creset %C(yellow bold)%d%Creset %s' --abbrev-commit --date=local --no-merges
#  l = log --max-count=36 --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%cn>%Creset' --abbrev-commit --date=relative --no-merges
#  sd = svn dcommit
#  sr = !git svn rebase
#  srb = !git sr && bundle && bundle exec rake db:migrate

#  up = !git fetch origin && git rebase origin/master
#  ir = !git rebase -i origin/master
#  done = !git fetch && git rebase origin/master && git checkout master && git merge @{-1} && rake && git push
[credential]
	helper = osxkeychain
[filter "media"]
	clean = git-media-clean %f
	smudge = git-media-smudge %f
[pull]
	rebase = true