Skip to content

Instantly share code, notes, and snippets.

@dschaper
Created May 24, 2017 00:45
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 dschaper/3aaea66b6e6f76573f4ad540a3c54918 to your computer and use it in GitHub Desktop.
Save dschaper/3aaea66b6e6f76573f4ad540a3c54918 to your computer and use it in GitHub Desktop.
[gpg]
program = gpg2
[commit]
gpgsign = 1
[user]
email = dschaper@ganymeade.com
name = Dan Schaper
signingkey = 2420EB8A7E12CEDA
[core]
editor = vim
[alias]
unstage = reset -q HEAD --
discard = checkout --
nevermind = !git reset --hard HEAD && git clean -d -f
uncommit = reset --mixed HEAD~
save = commit -m
resave = commit --amend
invert = revert
last = log -1 HEAD --format=format:"%Cred%H"
summary = status -u -s
graph = log --graph -10 --branches --remotes --tags --format=format:'%Cgreen%h %Creset• %<(75,trunc)%s (%cN, %ar) %Cred%d' --date-order
history = log -10 --format=format:'%Cgreen%h %Creset• %s (%cN, %ar)'
branchout = checkout -b
new-branch = checkout -b
tags = tag
branches = branch -a
stashes = stash list
remotes = remote -v
prestage = diff -w --word-diff=color
precommit = diff --cached -w --word-diff=color --word-diff-regex='[^[:space:]<>]+'
move = mv
remove = rm
unmerged = branch --no-merged
unstash = stash pop
what = show -w
untrack = rm -r --cached
rewrite = rebase -i
amend = commit --amend
back = checkout "-"
contributors = shortlog -s -n --no-merges
filetrail = log --follow -p -w
mergetrail = log --ancestry-path --merges
[merge]
conflictstyle = diff3
[blame]
date = relative
[push]
default = current
[url "https://aur.archlinx.org/"]
insteadOf = "aur:"
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment