My gitconfig file

.gitconfig

[user]
	name = Jeff French
	email = [email protected]
[color]
	diff = auto
	status = auto
	branch = auto
	interactive = auto
	ui = auto
[gc]
	auto = 1
[diff]
	tool = diffmerge
[difftool "diffmerge"]
	cmd = 'C:\\Chocolatey\\lib\\git.difftool.diffmerge.0.0.1\\content\\diffmerge-diff.sh' $LOCAL $REMOTE
[merge]
	tool = diffmerge
[mergetool "diffmerge"]
	cmd = 'C:\\Chocolatey\\lib\\git.difftool.diffmerge.0.0.1\\content\\diffmerge-merge.sh' $PWD/$LOCAL $PWD/$BASE $PWD/$REMOTE $PWD/$MERGED
	trustExitCode = false
	keepBackup = false
[alias]
	ci = commit
	co = checkout
	d = diff                                # show changes in the working directory (not including index)
	ds = diff --staged                      # show changes in the index only (not working directory)
	unstage = reset HEAD                    # un-add files from index (tracking)
	uncommit = reset --soft HEAD^           # go back one commit, put changes into your working dir and index
	chunkyadd = add --patch                 # stage commits chunk by chunk
	amend = commit --amend                  # fix last commit
	addall = !sh -c 'git add . && git add -u'
	outgoing = log -u origin/master..master # outgoing changes (in local, but not origin)
	b = branch -v                   # show commit messages on branch list
	t = tag -l                      # show commit messages on tag list
	r = remote -v                   # show urls of remotes
	rc = rebase --continue
	rs = rebase --skip
	ra = rebase --abort
	cp = cherry-pick -x
	nb = checkout -b
	changes = log --pretty=format:\"%h %cr %cn %Cgreen%s%Creset\" --name-status
	short = log --pretty=format:\"%h %cr %cn %Cgreen%s%Creset\"
	filelog = log -u  # show changes to a file
	changelog = log --pretty=format:\" * %s\"
[core]
	autocrlf = true
[branch]
	autosetuprebase = always
[push]
	default = tracking