Permalink
Switch branches/tags
Nothing to show
Find file
Fetching contributors…
Cannot retrieve contributors at this time
56 lines (52 sloc) 1.92 KB
[user]
name = Farruco Sanjurjo
email=madtrick@gmail.com
signingkey = FADA6934
[color]
ui = true
[core]
editor = vim
excludesfile = ~/.global_gitignore
pager = diff-so-fancy | less --tabs=4 -RFX
[alias]
f = "!git ls-files | grep -i" # find files
g = "grep -Ii" # grep for content on the index
gr = "!f() { A=$(pwd) && TOPLEVEL=$(git rev-parse --show-toplevel) && cd $TOPLEVEL && git grep --full-name -In $1 | xargs -I{} echo $TOPLEVEL/{} && cd $A; }; f"
lg = log --graph --pretty=format:'%Cred%h%Creset - %C(bold blue)%an%Creset %Cgreen(%cr) %C(yellow)%d%Creset %s ' --abbrev-commit --date=relative
lp = log -p
st = status --short
co = checkout
com = commit
ba = branch -a
cam = commit --amend --reuse-message=HEAD
nuke = reset --hard HEAD
vista = stash show -p stash@{0} #show the diff between the index and the first stash
current-branch = "rev-parse --abbrev-ref HEAD"
rebase-to-branch = "!f() { git rebase -i $(git merge-base $(git current-branch) $1); }; f" # rebase to the common ancestor between the current branch and the supplied one
ap = add -p
files-changed = show --pretty="format:" --name-only # shows files change in a commit
[push]
default = simple
# vim:ft=sh
#[diff]
# external = /Users/farruco/bin/git-external_patdiff
[filter "lfs"]
required = true
clean = git-lfs clean %f
smudge = git-lfs smudge %f
[commit]
gpgsign = true
# Color config extracted from
# https://github.com/so-fancy/diff-so-fancy#improved-colors-for-the-highlighted-bits
[color "diff"]
meta = yellow bold
commit = green bold
frag = magenta bold
old = red bold
new = green bold
whitespace = red reverse
[color "diff-highlight"]
oldNormal = red bold
oldHighlight = "red bold 52"
newNormal = "green bold"
newHighlight = "green bold 22"