-
Notifications
You must be signed in to change notification settings - Fork 0
/
Copy pathdot_gitconfig
73 lines (69 loc) · 2.14 KB
/
dot_gitconfig
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
[alias]
aa = add -A .
add-untracked = !"git status --porcelain | awk '/\\?\\?/{ print $2 }' | xargs git add"
aliases=!git config -l | grep '^alias' | cut -c 7- | sort
br = branch
cheddar = commit --amend -CHEAD
clean-remote = !"git remote | grep -v -e origin -e upstream | xargs -n1 git remote remove"
co = checkout
cp = cherry-pick
delete-merged-branches = !git branch --merged master | grep -v -e 'master' -e '\\*' | xargs -n 1 git nuke
doff = reset HEAD^
fixup = commit --fixup
fresh = branch --list --sort=-committerdate --format='%(committerdate) %(refname:short)'
hard = reset --hard
mend = commit --amend
nuke = !git branch -D $1 && git push origin --delete --no-verify
pruneremote = remote prune origin
puff = put --force
put = push origin HEAD
reset-authors = commit --amend --reset-author -CHEAD
ri = rebase --interactive
st = status
tr = log --graph --oneline --decorate --color
tree = log --graph --oneline --decorate --color --all
snapshot = !git stash save "snapshot: $(date)" && git stash apply "stash@{0}"
# What files have been touched recently? (Can take a path)
what = "log --name-status --pretty=\"%n%C(green)%C(bold)%s%n%C(blue)%cd%C(reset) %C(#eeeeee)%h\" --date=relative"
# Who's been up in these files? (Can take a path)
who = "log --follow --pretty=\"%C(blue)%cr%C(reset) %C(red)%C(bold)%an %C(reset)%C(green)%s\""
# When did some commit go out to staging? to production? (Takes a sha)
when = "! f() { for e in staging production; do git tag --list "$e-*" --contains $1 | sort | head -1; done }; f"
[branch]
autosetuprebase = always
[color]
ui = auto
[core]
editor = vim
excludesfile = ~/.global_ignore
ignorecase = false
whitespace = warn
[diff]
algorithm = patience
[fetch]
prune = true
[filter "trimWhitespace"]
clean = git-stripspace
[help]
autocorrect = 10
[include]
path = ~/.gitconfig.local
[interactive]
singlekey = true
[github]
user = damassi
[merge]
summary = true
[merge "bundlelock"]
name = lock Gemfile
driver = bundle install
[merge "bundle"]
name = bundle
driver = bundle
[push]
default = tracking
[rebase]
autosquash = true
[user]
name = Christopher Pappas
email = [email protected]