[user]
	name = <%= print("Your Name: "); STDOUT.flush; STDIN.gets.chomp %>
	email = <%= print("Your Email: "); STDOUT.flush; STDIN.gets.chomp %>
[core]
	excludesfile = <%= ENV['HOME'] %>/.gitignore
	editor = vim
[color]
	diff = auto
	status = auto
	branch = auto
[apply]
	whitespace = nowarn
[alias]
	ff = pull --ff-only
	recommit = commit --amend
  workdir-or-cwd = !echo $PWD
  workdir = rev-parse --show-toplevel
  prune = fetch --all --prune
[push]
	default = upstream
[mergetool "bc3"]
  cmd = /usr/bin/bcompare $LOCAL $REMOTE $BASE $MERGED
  trustExitCode = true
<% if File.exist?('/usr/bin/bcompare') %>
[merge]
  tool = bc3
<% end %>

[user]
	name = <%= print("Your Name: "); STDOUT.flush; STDIN.gets.chomp %>
	email = <%= print("Your Email: "); STDOUT.flush; STDIN.gets.chomp %>
[core]
	excludesfile = <%= ENV['HOME'] %>/.gitignore
	editor = vim
  eol = lf
  autocrlf = false
  compression = 9
  loosecompression = 1
[color]
	diff = auto
	status = auto
	branch = auto
[apply]
	whitespace = nowarn
[alias]
	ff = pull --ff-only
	recommit = commit --amend
  workdir-or-cwd = !echo $PWD
  workdir = rev-parse --show-toplevel
  prune = fetch --all --prune
  in-develop = log master..develop --pretty='format:%s' --no-merges
[push]
	default = upstream
[rebase]
  autosquash = true
<% if File.exist?('/usr/bin/bcompare') %>
[merge]
  tool = bc3
<% end %>

Add a bunch of new git settings
Add a bunch of new git settings
