forked from Droogans/dotfiles
-
Notifications
You must be signed in to change notification settings - Fork 1
/
.gitconfig
88 lines (88 loc) · 2.84 KB
/
.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
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
[user]
name = captain-kark
email = [email protected]
[color]
diff = always
status = always
branch = auto
interactive = auto
ui = true
pager = true
[color "branch"]
current = yellow
local = dim yellow
remote = magenta
[color "diff"]
meta = yellow
frag = dim white
old = red
new = cyan
whitespace = white reverse
[color "status"]
added = cyan
changed = red
untracked = yellow
remoteBranch = bold red
[alias]
aa = add -A
ap = apply --check # diff.patch
br = branch -a --no-merged
ci = commit
co = checkout
cp = cherry-pick
df = diff
dfc = diff --cached
find = !git l --all -p -S # search string
fp = format-patch
history = !git l --all -s -- # filename
l = log --pretty=tformat:'%Cred%h%Creset -%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset'
lg = "!f() { git l -n \"${1:-1}\"; }; f"
lgg = !git l -n 5
lggg = !git l -n 15
origin = push origin -q
purr = pull --rebase
recap = "!f() { git diff --stat ${1-HEAD}~1 ${1-HEAD}; }; f"
reverse = "!f() { git show ${1-HEAD^}..${2-HEAD} | git apply --reverse --3way; git reset .; }; f"
rip = commit --amend --no-edit
sbt = subtree push --prefix # app|dist origin gh-pages
so = !git am -3 --signoff < # diff.patch
sor = am --resolved
split = reset HEAD^
sq = "!f() { git reset --soft ${1}; git add -A; git commit; }; f"
st = !"if [ -z $PS1_NO_VERBOSE ]; then cd .; else git status -sb; fi"
sto = !git st
standup = !git lg --since yesterday --author `git config user.email`
update = "!git fetch --all --prune; git branch --no-contains HEAD --no-color --merged | xargs -n 1 git branch -d"
upstream = push upstream -q
use-head = "checkout --ours" # files
use-master = "checkout --ours" # files
use-old = "checkout --ours" # files
use-branch = "checkout --theirs" # files
use-commit = "checkout --theirs" # files
use-new = "checkout --theirs" # files
use-pick = "checkout --theirs" # files
[pager]
st = true
df = true
dfc = true
[push]
default = current
followTags = true
[core]
editor = /Applications/Emacs.app/Contents/MacOS/bin/emacsclient
excludesfile = ~/.gitignore.global
[url "https://"]
insteadOf = git://
[filter "lfs"]
clean = git-lfs clean -- %f
smudge = git-lfs smudge -- %f
required = true
process = git-lfs filter-process
[url "https://github.com/"]
insteadOf = git://github.com/
[diff]
renameLimit = 9999
[merge]
conflictStyle = diff3
[reset]
quiet = true