-
Notifications
You must be signed in to change notification settings - Fork 3
/
gitconfig
88 lines (88 loc) · 3.06 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 = Yumin Wong
email = [email protected]
[github]
# GitHub username for command-line tools
user = itsbagpack
[alias]
aa = add --all
br = branch
brpb = !git rev-parse --abbrev-ref HEAD | xargs echo -n | pbcopy
brcrnt = rev-parse --abbrev-ref HEAD
bselect = !git branch | grep -v '^*' | fzf-tmux --reverse | xargs git checkout
ca = commit --amend --verbose
car = commit --amend --no-edit
ci = commit
co = checkout
conflicted = !vim +Conflicted
count = git shortlog -sn
copysha = !git rev-parse HEAD | pbcopy
d = diff --patience --ignore-space-change
s = show --patience --ignore-space-change
df = "!f() { [ \"$GIT_PREFIX\" != \"\" ] && cd "$GIT_PREFIX"; git diff --color $@ | diff-so-fancy | less --tabs=4 -RFX; }; f"
dfw = !git df -w
dc = "!f() { [ \"$GIT_PREFIX\" != \"\" ] && cd "$GIT_PREFIX"; git diff --color --cached $@ | diff-so-fancy | less --tabs=4 -RFX; }; f"
dcw = !git dc -w
dup = !git checkout development && git fetch origin && echo && git sl development..origin/development && echo && git pull --quiet && git checkout -
mup = !git checkout master && git fetch origin && echo && git sl master..origin/master && echo && git pull --quiet && git checkout -
fall = fetch --all
fad = !git add $(git ls-files --others --exclude-standard -m | fzf --reverse --multi)
fadd = !git fadd
glog = log -E -i --grep
hist = log --pretty=format:\"%Cgreen%h%Creset %Cblue%ad%Creset %s%C(yellow)%d%Creset %Cblue[%an]%Creset\" --graph --date=short
p = push
pl = pull
praise = blame
rbc = rebase --continue
riu = !git rebase -i $(git rev-parse --abbrev-ref --symbolic-full-name @{u})
rid = !git rebase -i $(git merge-base development HEAD)
rim = !git rebase -i $(git merge-base master HEAD)
dim = !git rebase -i $(git merge-base development HEAD)
rdup = !git dup && git rebase development
rmup = !git mup && git rebase master
shas = log --pretty=format:\"%H\"
sl = log --oneline --decorate -20
sla = log --oneline --decorate --graph --all -20
slp = log --oneline --decorate
slap = log --oneline --decorate --graph --all
st = status
todo = !git log --format=%B -n 1 | grep -A999 '^This change$'
uncommit = reset --soft HEAD^
unstage = reset
upstream = rev-parse --abbrev-ref --symbolic-full-name @{u}
ureset = !git reset --hard $(git upstream)
[color]
ui = auto
[commit]
# Show the diff as a comment in the commit message template
verbose = true
[core]
# Exclude everything this file. Used for general exclusions.
excludesfile = ~/.gitignore
# Set attributes on files. Used for general diff improvements.
attributesfile = ~/.gitattributes
# Don't prompt for commit messages for merge commits
mergeoptions = --no-edit
[credential "https://github.com"]
username = itsbagpack
[fetch]
prune = true
[help]
# Autocorrect mistyped commands
autocorrect = 1
[log]
decorate = short
abbrevCommit = true
[merge]
conflictstyle = diff3
ff = only
log = true
[pull]
rebase = true
[push]
default = current
[rebase]
# Run `git statsh` if needed before a `git rebase`
autoStash = true
[rerere]
enabled = 1