# Original pre-modified file is copyright Ryan Bates
# See LICENSE_ryanb for full license text

[user]
  name = Abe Voelker
  email = abe@abevoelker.com
[alias]
  s = status
  a = add
  c = commit
  cm = commit -m
  co = checkout
  d = diff
  di = diff --cached
[color]
  ui = auto
[color "status"]
  header = normal
  added = bold green
  changed = red
  untracked = cyan
  branch = bold green
  nobranch = bold red
[core]
  excludesfile = <%= ENV['HOME'] %>/.gitignore
  editor = gvim -f
  autocrlf = input
[apply]
  whitespace = nowarn
[format]
  pretty = %C(yellow)%h%Creset %s %C(red)(%an, %cr)%Creset
[github]
  user = abevoelker
  token = <%= print("GitHub API Token: "); STDOUT.flush; STDIN.gets.chomp %>

# Original pre-modified file is copyright Ryan Bates
# See LICENSE_ryanb for full license text

[user]
  name = Abe Voelker
  email = abe@abevoelker.com
[alias]
  s = status
  a = add
  c = commit
  cm = commit -m
  co = checkout
  d = diff
  di = diff --cached
[color]
  ui = auto
[color "status"]
  header = normal
  added = bold green
  changed = red
  untracked = cyan
  branch = bold green
  nobranch = bold red
[core]
  excludesfile = <%= ENV['HOME'] %>/.gitignore
  editor = gvim -f
  autocrlf = input
[mergetool "gvimdiff3"]
  cmd = gvim -f -d -c \"wincmd J\" \"$MERGED\" \"$LOCAL\" \"$BASE\" \"$REMOTE\"
[mergetool "vimdiff3"]
  cmd = vim -f -d -c \"wincmd J\" \"$MERGED\" \"$LOCAL\" \"$BASE\" \"$REMOTE\"
[merge]
  tool = gvimdiff3
[apply]
  whitespace = nowarn
[format]
  pretty = %C(yellow)%h%Creset %s %C(red)(%an, %cr)%Creset
[github]
  user = abevoelker
  token = <%= print("GitHub API Token: "); STDOUT.flush; STDIN.gets.chomp %>

Set git mergetool to gVim configured for 3-way merge
Set git mergetool to gVim configured for 3-way merge
