.gitconfig

[user]
	name = myname
	email = mymail
[push]
	default = simple
[core]
	autocrlf = true
	editor = 'C:/Program Files (x86)/Notepad++/notepad++.exe' 
	whitespace = true
[diff]
	tool = vsdiffmerge
[difftool]
	prompt = true
[difftool "vsdiffmerge"]
	cmd = \"C:/Program Files (x86)/Common7/IDE/vsdiffmerge.exe\" \"$LOCAL\" \"$REMOTE\" //t
	keepbackup = false
	trustexistcode = true
[merge]
	tool = vsdiffmerge
[mergetool]
	prompt = true
[mergetool "vsdiffmerge"]
	cmd = \"C:/Program Files (x86)/Common7/IDE/vsdiffmerge.exe\" \"$REMOTE\" \"$LOCAL\" \"$BASE\" \"$MERGED\" //m
	keepbackup = false
	trustexistcode = true

[credential]
[credential]
	helper = wincred
[apply]
	whitespace = true

[alias]
	#
	# Working with branches by Rob Miller  (from https://gist.github.com/robmiller/6018582  )
	#

	# Get the current branch name (not so useful in itself, but used in
	# other aliases)
	branch-name = "!git rev-parse --abbrev-ref HEAD"
	# Push the current branch to the remote "origin", and set it to track
	# the upstream branch
	publish = "!git push -u origin $(git branch-name)"
	pub = "!git $(git publish)"	 # Short for publish

	# Some more aliases
	cor = "!git checkout -b origin/"   # Add name of remote branch, and check it out (+ create local tracking) branch, :::  git cor mybranch,  where mybranch is a remote branch
	aliases = "!git config --get-regexp alias"
	master = "!git checkout master"  # To go quickly to master branch
	fetchall = "!git fetch origin"
	pr = "!f() { exec vsts code pr \"$@\"; }; f"
	repo = "!f() { exec vsts code repo \"$@\"; }; f"
[winUpdater]
	recentlySeenVersion = 2.15.0.windows.1
[pull]
	rebase = true
[fetch]