dotfiles/tag-git/gitconfig

[alias]
	aa = add --all
	assume = update-index --assume-unchanged
	assumed = !git ls-files -v | grep '^[hsmrck?]' | cut -c 3-
	b = branch
	browse = !hub browse
	ca = commit --amend --verbose
	car = commit --amend --no-edit
	co = checkout
	compare = !hub compare
	dc = diff --color --word-diff --cached
	df = diff --color --word-diff
	fixup = commit --fixup
	issues = !hub browse -- issues
	nah = !git reset --hard && git clean -fd
	no-ff = merge --no-ff
	pl = pull
	prune = remote prune origin
	ps = push
	pulls = !hub browse -- pulls
	rbc = rebase --continue
	remotes = remote -v
	repush = !git pull --rebase && git push
	ri = rebase --interactive
	rid = !git rebase -i $(git merge-base develop HEAD)
	rim = !git rebase -i $(git merge-base master HEAD)
	riu = !git rebase -i $(git rev-parse --abbrev-ref --symbolic-full-name @{u})
	sl = log --oneline --decorate -20
	sla = log --oneline --decorate --graph --all -20
	slap = log --oneline --decorate --graph --all
	slp = log --oneline --decorate
	staged = diff --staged
	unassume = update-index --no-assume-unchanged
	uncommit = reset --soft HEAD^
	unstage = reset
	upstream = rev-parse --abbrev-ref --symbolic-full-name @{u}
	ureset = !git reset --hard $(git upstream)
	wip = !git add . && git commit -m 'wip'

[branch]
	autosetupmerge = true
	autosetuprebase = always

[checkout]
        defaultRemote = origin

[color]
	branch = auto
	diff = auto
	status = auto
	ui = true

[color "branch"]
	current = red reverse
	local = blue
	remote = green

[color "diff"]
	meta = yellow
	frag = magenta
	old = red bold
	new = green
	plain = white

[color "status"]
	added = yellow
	changed = green
	untracked = cyan

[commit]
	template = ~/.gitmessage
	verbose = true

[core]
	excludesFile = ~/.gitignore

[diff]
	tool = vimdiff

[fetch]
	# Always prune when fetching (and pulling).
	prune = true

[gitsh]
	nogreeting = true

[grep]
	# Show the line numbers in the output.
	lineNumber = true

[help]
	autocorrect = 1

[include]
	path = ~/.gitconfig.local

[rebase]
	autosquash = true
	autostash = true

[rerere]
	# Store and re-use manual conflict resolution changes.
	enabled = true

[push]
	default = upstream

[url "https://git.drupal.org/project/"]
	insteadOf = do:
	insteadOf = drupal:

[pull]
	ff = only
	rebase = true

[merge]
	defaultToUpstream = true
	ff = false

[filter "lfs"]
	process = git-lfs filter-process
	required = true
	clean = git-lfs clean -- %f
	smudge = git-lfs smudge -- %f