-
Notifications
You must be signed in to change notification settings - Fork 6
Expand file tree
/
Copy pathgitconfig
More file actions
108 lines (85 loc) · 2.24 KB
/
Copy pathgitconfig
File metadata and controls
108 lines (85 loc) · 2.24 KB
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
[user]
name = Juan Ignacio Donoso
email = jidonoso@gmail.com
[credential]
helper = osxkeychain
[alias]
aa = add --all
ap = add --patch
ca = commit --amend
cm = commit
cmm = commit -m
ci = commit -a
co = checkout
cp = checkout --patch
cb = checkout -b
create-branch = !sh -c 'git push origin HEAD:refs/heads/$1 && git fetch origin && git branch --track $1 origin/$1 && cd . && git checkout $1' -
delete-branch = !sh -c 'git push origin :refs/heads/$1 && git branch -D $1' -
default-branch = "!sh -c 'git symbolic-ref refs/remotes/origin/HEAD --short | cut -d\"/\" -f2'"
merged-branches = "!sh -c 'DEFAULT_BRANCH=$(git default-branch) && git branch --merged $DEFAULT_BRANCH --format \"%(refname:short)\"'"
prune-branches = !sh -c 'DEFAULT_BRANCH=$(git default-branch) && git merged-branches | grep -v $DEFAULT_BRANCH | xargs -n 1 git branch -d'
fixup = !sh -c 'REV=$(git rev-parse $1) && git commit --fixup $@ && git rebase -i --autosquash $REV^' -
st = status
rb = rebase
wip = commit -a -m "wip"
dewip = reset HEAD~1
squash = !sh -c 'REV=$(git rev-parse $1) && git commit --squash $@ && git rebase -i --autosquash $REV^' -
lg = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr)%Creset %an' --abbrev-commit --date=relative
bb = !~/.dotfiles/script/better-branch
[core]
excludesfile = ~/.gitignore
autocrlf = input
pager = delta
[push]
default = simple
autoSetupRemote = true
[pull]
ff = only
[color]
ui = auto
[fetch]
prune = true
[merge]
ff = only
conflictstyle = zdiff3
[rebase]
autosquash = true
autoStash = true
updateRefs = true
[commit]
template = ~/.gitmessage
[rerere]
enable = true
autoupdate = true
[log]
date = auto:human
[interactive]
diffFilter = delta --color-only
#[gitsh]
# noGreeting = true
# defaultCommand = status --short --branch && :echo
#[gitsh "color"]
# default = cyan
# untracked = yellow
# modified = red
[diff]
algorithm = patience
colorMoved = default
[github]
user = blackjid
[pager]
diff = delta
show = delta
[delta]
navigate = true
line-numbers = true
side-by-side = true
# syntax-theme = ansi
[tag]
sort = -v:refname
[init]
defaultBranch = main
[branch]
sort = -committerdate
[column]
ui = auto