.gitconfig

.gitconfig

[user]
	name = TechPulseToday
	username = techpulsetoday
	email = [email protected]
[init]
	templatedir = ~/.git-templates
[core]
	editor = vim
	whitespace = fix,-indent-with-non-tab,trailing-space,cr-at-eol
[web]
	browser = google-chrome
[instaweb]
	httpd = apache2 -f
[rerere]
	enabled = 1
	autoupdate = 1
[diff]
	tool = meld
[difftool]
	prompt = false
[merge]
	tool = meld
[mergetool]
	prompt = false
[color]
	ui = auto
	branch = auto
	diff = auto
	status = auto
	interactive = auto
[color "branch"]
	current = green bold
	local = white bold
	remote = cyan bold
[color "diff"]
	meta = yellow bold
	frag = magenta bold
	old = red bold
	new = green bold
	whitespace = red reverse
[color "status"]
	added = green bold
	changed = yellow bold
	untracked = red bold
[color "interactive"]
	error = red
	prompt = yellow
	header = normal
	help = green
[alias]
	last = log -1 HEAD
	lg = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr)%Creset' --abbrev-commit --date=relative
	lol = log --graph --decorate --pretty=oneline --abbrev-commit
	mrg = !git fetch --all --prune && git checkout $2 && git pull origin $2 && git merge $1 && git push origin $2 && git checkout $1 && git merge $2 && git branch -v -a && :

	# Sync with remote, overwrite local changes
	sync = !git fetch origin && git reset --hard origin/master && git clean -f -d

	# List all the conflicted files
	conflicted-files = !git diff --name-only --diff-filter=U

	# Show all ignored files
	ignored-files = !git ls-files --others -i --exclude-standard

	# Archive the master branch
	archive-master = !git archive master --verbose --format=zip --output=master.zip