Permalink
Switch branches/tags
Nothing to show
Find file
Fetching contributors…
Cannot retrieve contributors at this time
133 lines (98 sloc) 3.27 KB
[user]
name = Cenk Alti
email = cenkalti@gmail.com
signingKey = 45173BCEAB1B618F917DFFC12DB2EA6FD1BF1761
[commit]
gpgsign = true
[alias]
# List aliases
ls = "!git config --get-regexp alias\\. | sed 's/^......//' | sed 's/ / /'"
st = status --short --branch
stu = status -uno
ci = commit -m
ce = commit --allow-empty-message -m ''
pom = pull origin master --no-edit
pomp = "!git pull origin master --no-edit && git push"
# Edit last commit message
edit = commit --amend
# Amend the changes into previos commit
amend = commit --amend -C HEAD
# Dangerous commands
#
pr = pull --rebase
prp = "!git pull --rebase && git push"
pp = "!git pull --no-edit && git push"
ss = "!git stash && git pull --rebase --no-edit && git push && git stash pop"
co = checkout
cp = cherry-pick
br = branch
wc = whatchanged
df = diff
dfc = diff --cached
today = log --since="6am"
# Show the fetched commits
lc = log ORIG_HEAD.. --stat --no-merges
lol = log --graph --decorate --oneline --abbrev-commit
lola = log --graph --decorate --oneline --abbrev-commit --all
# Show commits between two refs. Pass argument like master...feature
lr = log --graph --oneline --left-right --cherry-pick
# Show commits between master and the current branch
lrm = "!git log --graph --oneline --left-right --cherry-pick master...`git rev-parse HEAD`"
xxx = reset --hard
prev = reset HEAD^
assume = update-index --assume-unchanged
unassume = update-index --no-assume-unchanged
assumed = "!git ls-files -v | grep ^h | cut -c 3-"
# Delete local branch
db = branch -D
# Delete local branches that are merged into master
dm = "!git branch --merged | grep -v '*' | grep -v 'master$' | xargs -n 1 git branch -d"
# Delete remote branch
dr = push origin --delete
# Add only untracked files
au = "!git ls-files -o --exclude-standard -z | xargs -0 git add"
[color]
ui = true
pager = true
[color "branch"]
current = yellow reverse
local = yellow
remote = green
[color "diff"]
meta = yellow bold
frag = magenta bold
old = red bold
new = green bold
whitespace = red reverse
[color "status"]
added = green
changed = yellow
untracked = cyan
[core]
editor = vim
excludesfile = ~/.gitignore_global
autocrlf = false
pager = less -RS
[clean]
requireForce = false
[merge]
summary = true
conflictstyle = diff3
[push]
default = current
[diff]
algorithm = patience
compactionHeuristic = true
[pager]
diff = "diff-so-fancy | less --tabs=1,5 -RS"
show = "diff-so-fancy | less --tabs=1,5 -RS"
[credential]
helper = osxkeychain
[interactive]
diffFilter = "diff-so-fancy | less --tabs=4 -RFX"
[github]
user = cenk
[ghi]
token = !security find-internet-password -a cenk -s github.com -l 'ghi token' -w
[gpg]
program = /usr/local/bin/gpg2