dotfiles/gitconfig at master · pmueller/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
[core]
  editor = vim
  excludesfile = ~/.gitignore
[include]
  path = .gituserconfig
[alias]
  ls = show-ref
  st = status
  co = checkout
  ci = commit -s
  ciff = diff --cached
  br = branch
  vis = !gitk --all &
  llog = log --date=local
  unpushed = !"PROJ_BRANCH=$(git symbolic-ref HEAD | sed 's|refs/heads/||') && git log origin/$PROJ_BRANCH..HEAD"
  unpulled = !"PROJ_BRANCH=$(git symbolic-ref HEAD | sed 's|refs/heads/||') && git fetch && git log HEAD..origin/$PROJ_BRANCH"
  w = whatchanged
  sw = !"git reflog | grep checkout | grep -v "\\^0$" | head -n 1 | cut -d ' ' -f 6 | xargs git checkout"
[merge]
  tool = diffmerge
[diff]
  tool = diffmerge
[mergetool "diffmerge"]
  cmd = diffmerge --merge --result=$MERGED $LOCAL $BASE $REMOTE
  trustExitCode = true
[difftool "diffmerge"]
  cmd = diffmerge $LOCAL $REMOTE
[format]
  pretty = format:"%h %C(yellow)%ci%Creset %Cgreen%an%Creset | %s"
[color]
  branch = auto
  diff = auto
  status = auto
[color "branch"]
  current = green reverse
  local = green
  remote = red
[push]
  default = current
[apply]
  whitespace = nowarn
[branch]
  autosetupmerge = true
  autosetuprebase = always
[rebase]
  stat = true
[branch "*branch-name*"]
  rebase = true