gitconfig

[user]
	name = Alberto
	email = alberto@m8l.com
	useConfigOnly = true
	signingkey = 98C7C11D6E8D7F0B

[includeIf "gitdir:~/src/github.com/work_org/"]
  path = ~/.gitconfig_work

[alias]
	# View abbreviated SHA, description, and history graph of the latest 20 commits
	l = log --pretty=oneline -n 20 --graph --abbrev-commit
	# View the current working tree status using the short format
	s = status -s
	# Show the diff between the latest commit and the current state
	d = !"git diff-index --quiet HEAD -- || clear; git --no-pager diff --patch-with-stat"
	# `git di $number` shows the diff between the state `$number` revisions ago and the current state
	di = !"d() { git diff --patch-with-stat HEAD~$1; }; git diff-index --quiet HEAD -- || clear; d"
	# Pull in remote changes for the current repository and all its submodules
	p = !"git pull; git submodule foreach git pull origin master"
	# Clone a repository including all submodules
	c = clone --recursive
	# Commit all changes
	ca = !git add -A && git commit -av
	# Switch to a branch, creating it if necessary
	go = checkout -B
	# Show verbose output about tags, branches or remotes
	tags = tag -l
	branches = branch -a
	remotes = remote -v
	# Credit an author on the latest commit
	credit = "!f() { git commit --amend --author \"$1 <$2>\" -C HEAD; }; f"
	# Interactive rebase with the given number of latest commits
	reb = "!r() { git rebase -i HEAD~$1; }; r"
	# Find branches containing commit
	fb = "!f() { git branch -a --contains $1; }; f"
	# Find tags containing commit
	ft = "!f() { git describe --always --contains $1; }; f"
	# Find commits by source code
	fc = "!f() { git log --pretty=format:'%C(yellow)%h  %Cblue%ad  %Creset%s%Cgreen  [%cn] %Cred%d' --decorate --date=short -S$1; }; f"
	# Find commits by commit message
	fm = "!f() { git log --pretty=format:'%C(yellow)%h  %Cblue%ad  %Creset%s%Cgreen  [%cn] %Cred%d' --decorate --date=short --grep=$1; }; f"
	# Remove branches that have already been merged with master
	dm = "!git branch --merged | grep -v '\\*' | xargs -n 1 git branch -d"
	# Un-push a commit but leave the local repo intact
	unpush = "push -f origin HEAD^:master"
	# Extract file from another branch
	sf = !"git show $1:$2"

	# === Additional useful aliases ===
	# Undo last commit but keep changes staged
	undo = reset --soft HEAD~1
	# Amend last commit without changing message
	amend = commit --amend --no-edit
	# List branches sorted by last modified
	recent = branch --sort=-committerdate --format='%(HEAD) %(color:yellow)%(refname:short)%(color:reset) - %(contents:subject) %(color:green)(%(committerdate:relative))%(color:reset)'
	# Better log with graph
	lg = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit
	# Quick WIP commit
	wip = !git add -A && git commit -m 'WIP'
	# Unstage all staged changes
	unstage = reset HEAD --
	# Show last commit
	last = log -1 HEAD --stat
	# List aliases
	aliases = config --get-regexp alias
	# Diff staged changes
	staged = diff --cached
	# List contributors with number of commits
	contributors = shortlog --summary --numbered
	# Stash including untracked files
	stash-all = stash push --include-untracked
	# Clean merged branches (excluding main/master/develop)
	cleanup = "!git branch --merged | grep -v '\\*\\|main\\|master\\|develop' | xargs -n 1 git branch -d"
	# Show files changed in last commit
	changed = show --stat --oneline HEAD
	# Create a new branch and switch to it
	new = checkout -b
	# Push and set upstream
	pushu = push -u origin HEAD

[apply]
	# Detect whitespace errors when applying a patch
	whitespace = fix

[core]
	pager = delta
	# Use custom `.gitignore` and `.gitattributes`
	excludesfile = ~/.gitignore
	attributesfile = ~/.gitattributes
	# Treat spaces before tabs and all kinds of trailing whitespace as an error.
	# [default] trailing-space: looks for spaces at the end of a line
	# [default] space-before-tab: looks for spaces before tabs at the beginning of
	# a line
	whitespace = space-before-tab,-indent-with-non-tab,trailing-space
	# Make `git rebase` safer on OS X
	# More info: <http://www.git-tower.com/blog/make-git-rebase-safe-on-osx/>
	trustctime = false
	editor = nvim
	hooksPath = ~/dotfiles/git_hooks

[color]
	# Use colors in Git commands that are capable of colored output when
	# outputting to the terminal. (This is the default setting in Git ≥ 1.8.4.)
	ui = auto
[color "branch"]
	current = yellow reverse
	local = yellow
	remote = green
[color "diff"]
	meta = yellow bold
	frag = magenta bold
	old = red bold
	new = green bold
[color "status"]
	added = yellow
	changed = green
	untracked = cyan
[merge]
	# Include summaries of merged commits in newly created merge commit messages
	log = true
	tool = vimdiff3

[push]
	default = current
[init]
	templatedir = ~/dotfiles/git_hooks
	defaultBranch = main
[mergetool]
	path = /usr/local/bin/nvim

[merge]
	tool = nvimdiff4
	# if not using a tool name with builtin support, must supply mergetool cmd
	# as below

[mergetool "nvimdiff4"]
    cmd = nvim -d $LOCAL $BASE $REMOTE $MERGED -c '$wincmd w' -c 'wincmd J'

[mergetool "nfugitive"]
    cmd = nvim -f -c "Gdiff" "$MERGED"

[diff]
      tool = nvimdiff2

[difftool "nvimdiff2"]
      cmd = nvim -d $LOCAL $REMOTE
[filter "lfs"]
	clean = git-lfs clean -- %f
	smudge = git-lfs smudge -- %f
	process = git-lfs filter-process
	required = true
[gpg]
	program = /usr/local/bin/gpg
[url "git@gitlab.com:"]
	insteadOf = https://gitlab.com/
[pull]
	rebase = false