Skip to content

Instantly share code, notes, and snippets.

@rtyler
Created March 30, 2020 22:28
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save rtyler/4ebfcb15bfd6500c00363d020f346997 to your computer and use it in GitHub Desktop.
Save rtyler/4ebfcb15bfd6500c00363d020f346997 to your computer and use it in GitHub Desktop.
[user]
name = R. Tyler Croy
email = rtyler@brokenco.de
signingkey = BEF6CEA2
[github]
user = rtyler
[pack]
threads = 2
[core]
packedgitlimit = 1G
pager = diff-so-fancy | less --tabs=4 -RFX
excludesfile = /home/tyler/.gitignore
editor = vim
[alias]
patch = !sh -c 'git format-patch --stdout $0...$0~'
lolwut = !sh -c 'git show $0'
mpatch = !sh -c 'git format-patch $0...$0~ --suffix=.patch.temp && git send-email *.patch.temp $1 && rm *.patch.temp'
mpatchset = !sh -c 'git format-patch $0...$1 --suffix=.patch.temp && git send-email *.patch.temp $2 && rm *.patch.temp'
btrack = !sh -c 'git fetch origin && git branch --track $0 origin/$0'
conedit = "!f() { git ls-files --unmerged | cut -f2 | sort -u ; }; vim `f`"
conadd = "!f() { git ls-files --unmerged | cut -f2 | sort -u ; }; git add `f`"
retrack = "!f() { branch=$(git symbolic-ref HEAD | sed 's/refs\\/heads\\///g'); git config branch.$branch.remote origin; git config branch.$branch.merge refs\\/heads\\/$branch; }; f"
pushme = "!f() { branch=$(git symbolic-ref HEAD | sed 's/refs\\/heads\\///g'); git push origin $branch; }; f"
unique = "!f() { branch=$(git symbolic-ref HEAD | sed 's/refs\\/heads\\///g'); git log origin/master...$branch $@; }; f"
dunique = "!f() { branch=$(git symbolic-ref HEAD | sed 's/refs\\/heads\\///g'); git diff origin/master...$branch $@; }; f"
mergelog = "!f() { git log $2 $1^2 --not $1^1; }; f"
pup = "!f(){ branch=$(git symbolic-ref HEAD | sed 's/refs\\/heads\\///g');git push -f $1 +${branch}:pu;}; f"
fetchall = fetch --all
newproj = "!f() { mkdir $1 && cd $1 && git init && touch README.markdown && git add README.markdown && git commit -m 'Initial commit' && echo && echo 'Project created';}; f"
st = status -sb
ci = commit -v
br = branch
co = checkout
df = difftool
pick = cherry-pick
who = shortlog -s --
#log
lg = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr)%Creset' --abbrev-commit --date=relative
recent = "!f() { git lg -n 10 | cat; echo; }; f"
rlog = log --reverse
flg = log -M --summary --stat --date=relative --abbrev-commit
plg = log --graph --pretty=oneline --abbrev-commit --decorate --color --all
#diff
changes=diff --name-status -r
diffstat=diff --stat -r
last = cat-file commit HEAD
d = difftool
[sendemail]
confirm = auto
smtpencryption = ssl
smtpserver = mail.geekisp.com
smtpuser = tyler@monkeypox.org
[color]
ui = true
branch = auto
diff = auto
status = auto
[color "branch"]
current = yellow reverse
local = yellow
remote = green
[color "diff"]
meta = yellow
frag = magenta bold
old = red bold
new = green bold
commit = yellow bold
whitespace = red reverse
[color "status"]
added = yellow
changed = green
untracked = cyan
[diff]
tool = vimdiff
[difftool]
prompt = false
[tig "color"]
title-blur = white black
title-focus = white black
cursor = red default underline
[push]
default = matching
#[remote "origin"]
# fetch = +refs/pull/*/head:refs/remotes/origin/pr/*
[commit]
gpgsign = true
[credential]
helper = store
[color "diff-highlight"]
oldNormal = red bold
oldHighlight = red bold 52
newNormal = green bold
newHighlight = green bold 22
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment