dotfiles/gitconfig at master · mattdb/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
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
[core]
  excludesfile = /Users/matt/.gitignore
  editor = atom --wait
  autocrlf = input
  pager = diff-so-fancy | less --tabs=4 -RFX

[user]
  name = Matt Bauer
  email = bauer@sitespark.com
	signingkey = AA247366A341FB256FB740DF8B19FD47C0522772
[github]
  user = mattdb

[credential]
	helper = osxkeychain
[commit]
  gpgsign = true
[gpg]
  program = /usr/local/bin/gpg

[alias]
  co = checkout
  # Log display from screencast, with train tracks.
  l = log --graph --pretty=format':%C(yellow)%h%Cblue%d%Creset %s %C(white) %an, %ar%Creset'
  # Alternate log display from Scott Chacon
  lol = log --pretty=oneline --abbrev-commit --graph --decorate
  # Other useful aliases:
  unstage = reset HEAD
  staged = diff --cached
  unstaged = diff
  current-branch = !git symbolic-ref -q HEAD | sed -e 's|^refs/heads/||'
  # Usage: git track origin/feature-123-login-form
  track = checkout -t
  bail = reset --hard HEAD^
  st = status --branch --short

[color]
  diff = auto
  status = auto
  branch = auto
  ui = true
[color "status"]
	added = green bold
	changed  = cyan bold
	untracked = yellow bold
[color "branch"]
	current = cyan bold
	local = yellow
	remote = green
[color "diff-highlight"]
  oldNormal = red bold
  oldHighlight = red bold 52
  newNormal = green bold
  newHighlight = green bold 22

[format]
  pretty = %C(yellow)%h%Creset %s %C(red)(%an, %cr)%Creset

[help]
  autocorrect = 1

[apply]
  whitespace = warn
[status]
  submodulesummary = true
  submodule = 1

[fetch]
  prune = true
[push]
  default = upstream
[merge]
  tool = Kaleidoscope
[mergetool]
	keepBackup = true
  prompt = false
[mergetool "Kaleidoscope"]
  cmd = ksdiff --merge --output \"$MERGED\" --base \"$BASE\" -- \"$LOCAL\" --snapshot \"$REMOTE\" --snapshot
  trustExitCode = true
[diff]
  tool = Kaleidoscope
[difftool]
  prompt = false
[difftool "Kaleidoscope"]
  cmd = ksdiff --partial-changeset --relative-path \"$MERGED\" -- \"$LOCAL\" \"$REMOTE\"

[filter "media"]
  clean = git-media-clean %f
  smudge = git-media-smudge %f
[filter "lfs"]
  required = true
  clean = git-lfs clean -- %f
	smudge = git-lfs smudge -- %f
	process = git-lfs filter-process