[user]
  name = <%= print("Your Name: "); STDOUT.flush; STDIN.gets.chomp %>
  email = <%= print("Your Email: "); STDOUT.flush; STDIN.gets.chomp %>
[color]
  ui = auto
[core]
  excludesfile = <%= ENV['HOME'] %>/.gitignore
  editor = mvim -f
[apply]
  whitespace = nowarn
[format]
  ; pretty = %C(yellow)%h%Cred%d %Creset%s
[github]
  user = <%= print("Your github user: "); STDOUT.flush; STDIN.gets.chomp %>
[alias]
  ad = add
  au = add -u
  bl = blame
  br = branch
  ca = commit --amend
  cb = checkout -b
  cl = clone
  cm = commit
  co = checkout
  cp = cherry-pick
  dc = diff --cached
  df = diff
  ft = fetch
  lg = log
  mr = merge
  pl = pull
  ps = push
  rb = rebase
  rm = rm -r
  rs = reset
  rv = revert
  sa = stash apply
  sh = show
  sl = stash list
  sm = submodule
  sp = stash pop
  ss = stash save
  st = status
  sw = stash show

  rmb = !sh -c 'git branch -d $1 && git push origin :$1' -
  commit-count = shortlog -s -n
[branch]
  autosetuprebase = always
[pull]
  rebase = true
[push]
  default = upstream

[user]
  name = <%= print("Your Name: "); STDOUT.flush; STDIN.gets.chomp %>
  email = <%= print("Your Email: "); STDOUT.flush; STDIN.gets.chomp %>
[color]
  ui = auto
[core]
  excludesfile = <%= ENV['HOME'] %>/.gitignore
  editor = mvim -f
[apply]
  whitespace = nowarn
[format]
  ; pretty = %C(yellow)%h%Cred%d %Creset%s
[github]
  user = <%= print("Your github user: "); STDOUT.flush; STDIN.gets.chomp %>
[alias]
  ad = add
  au = add -u
  bl = blame
  br = branch
  ca = commit --amend
  cb = checkout -b
  cl = clone
  cm = commit
  co = checkout
  cp = cherry-pick
  dc = diff --cached
  df = diff
  ft = fetch
  lg = log
  mr = merge
  pl = pull
  ps = push
  rb = rebase
  rm = rm -r
  rs = reset
  rv = revert
  sa = stash apply
  sh = show
  sl = stash list
  sm = submodule
  sp = stash pop
  ss = stash save
  st = status
  sw = stash show

  rmb = !sh -c 'git branch -d $1 && git push origin :$1' -
  commit-count = shortlog -s -n
[branch]
  autosetuprebase = always
[pull]
  rebase = true
[push]
  default = upstream
[merge]
  ff = false

Add git config to force merge commits instead of fast forwarding
Add git config to force merge commits instead of fast forwarding
