-
Notifications
You must be signed in to change notification settings - Fork 0
/
Copy pathgitconfig
118 lines (96 loc) · 2.28 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
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
[user]
name = Dimitar Haralanov
email = dharalanov@me.com
[github]
user = dalizard
[init]
defaultBranch = main
[core]
excludesfile = ~/.gitignore_global
autocrlf = false
editor = vim
attributesfile = /Users/dimitar/.gitattributes
[diff]
compactionHeuristic = true
colorMoved = zebra
[color]
ui = auto
[color "branch"]
current = yellow reverse
local = yellow
remote = green
[color "decorate"]
head = cyan
branch = green
remoteBranch = red
tag = green
[color "diff"]
meta = yellow
frag = magenta
old = red
new = green
whitespace = red reverse
[color "log"]
author = green bold
[color "status"]
added = yellow
changed = green
untracked = cyan
[grep]
lineNumber = true
[alias]
s = status --short --branch --ignore-submodules=untracked
amend = commit --amend
di = diff
dc = diff --cached
b = branch
c = commit
co = checkout
aa = add --all
ff = merge --ff-only
pf = push --force-with-lease
pullff = pull --ff-only
noff = merge --no-ff
fa = fetch --all
ds = diff --stat=160,120
dh1 = diff HEAD~1
fix = !vim +/'<<<<<<<' $(git ls-files --unmerged | cut -f2 | uniq)
db = !find db -name schema.rb -o -name structure.sql | xargs git checkout HEAD --
cc = !git branch | fzf-tmux -d 15 | xargs git co
ir = !fish -c gir
fixup = "!f() { TARGET=$(git rev-parse "$1"); git commit --fixup=$TARGET ${@:2} && EDITOR=true git rebase -i --autostash --autosquash $TARGET^; }; f"
# Fancy logging.
# h = head
# hp = head with patch
# r = recent commits, only current branch
# ra = recent commits, all reachable refs
# l = all commits, only current branch
# la = all commits, all reachable refs
head = !git l -1
h = !git head
hp = "!. ~/.githelpers && show_git_head"
r = !git l -30
ra = !git r --all
l = "!. ~/.githelpers && pretty_git_log"
la = !git l --all
lol = log --graph --decorate --pretty=oneline --abbrev-commit
lola = log --graph --decorate --pretty=oneline --abbrev-commit --all
[merge]
tool = vimdiff
conflictStyle = diff3
[push]
default = simple
[pull]
rebase = true
[status]
showUntrackedFiles = all
[commit]
verbose = true
[branch]
autoSetupRebase = always
[rerere]
enabled = true
[rebase]
autosquash = true
[includeIf "gitdir:~/Code/Shogun"]
path = .gitconfig-work