My Git Configuration

.gitmessage.txt

Subject line (try to keep under 50 characters)

Multi-line description of commit,
feel free to be detailed.

Related work items: #<TFS_ITEM#>

Add Instructions

git config --global commit.template ~/.gitmessage.txt

My .gitconfig (Windows)

# This is Git's per-user configuration file.
[user]
# Please adapt and uncomment the following lines:
	name = Daniel Petersen
	email = [email protected]
[color]
	ui = auto
[gui]
	recentrepo = C:/TFS/GP.IT-AppDev
	recentrepo = C:/TFS/GP.IT-ALIS Canada
[core]
	pager = less
	editor = code --wait
[http]
	sslVerify = false
[winUpdater]
	recentlySeenVersion = 2.16.1.windows.1
[branch]
	autoSetupRebase = always
[pull]
	rebase = true
[fetch]
	prune = true
[diff]
	tool = default-difftool
[difftool "default-difftool"]
	cmd = code --wait --diff $LOCAL $REMOTE
[alias]
	lg = !"git lg1"
	lg1 = !"git lg1-specific --all"
	lg2 = !"git lg2-specific --all"
	lg3 = !"git lg3-specific --all"

	lg1-specific = log --graph --abbrev-commit --decorate --format=format:'%C(bold blue)%h%C(reset) - %C(bold green)(%ar)%C(reset) %C(white)%s%C(reset) %C(dim white)- %an%C(reset)%C(auto)%d%C(reset)'
	lg2-specific = log --graph --abbrev-commit --decorate --format=format:'%C(bold blue)%h%C(reset) - %C(bold cyan)%aD%C(reset) %C(bold green)(%ar)%C(reset)%C(auto)%d%C(reset)%n''          %C(white)%s%C(reset) %C(dim white)- %an%C(reset)'
	lg3-specific = log --graph --abbrev-commit --decorate --format=format:'%C(bold blue)%h%C(reset) - %C(bold cyan)%aD%C(reset) %C(bold green)(%ar)%C(reset) %C(bold cyan)(committed: %cD)%C(reset) %C(auto)%d%C(reset)%n''          %C(white)%s%C(reset)%n''          %C(dim white)- %an <%ae> %C(reset) %C(dim white)(committer: %cn <%ce>)%C(reset)'

Standard Git Configuration Setup

git config --global user.name "Daniel Petersen"
git config --global user.email "[email protected]"
git config --global core.editor "code --wait"
git config --global fetch.prune true
git config --global pull.rebase true
git config --global branch.autoSetupRebase always

# Setting up VS Code as diff tool

## Edit config

git config --global -e 

## Add the following lines to the config file

[diff]
	tool = default-difftool
[difftool "default-difftool"]
	cmd = code --wait --diff $LOCAL $REMOTE
	
## Alternative to git pull --rebase

git fetch --all
git rebase -p origin/develop