-
Notifications
You must be signed in to change notification settings - Fork 0
/
Copy path.gitconfig
101 lines (77 loc) · 2.29 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
[alias]
co = checkout
ci = commit
st = status
br = branch
hist = log --pretty=format:'%h %ad | %s%d [%an]' --graph --date=short
type = cat-file -t
dump = cat-file -p
## -- ## -- ## -- ## --
lg = log --color --decorate --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an (%G?)>%Creset' --abbrev-commit
ilog = log --all --pretty=oneline --pretty=format:"%Cgreen%h%Creset %s %Cred%d%Creset" --color=always | sk --ansi --preview 'git show --pretty=medium --color=always $(echo {} | cut -d" " -f1)' | cut -d" " -f1 | git show
# Remove branches that have already been merged with master
# a.k.a. ‘delete merged’
delete-merged = "!git branch --merged | grep -v '\\*' | xargs -n 1 git branch -d; git remote -v update -p"
# Interactive rebase with the given number of latest commits
irebase = "!r() { git rebase -i HEAD~$1; }; r"
# Switch to a branch, creating it if necessary
go = "!f() { git checkout -b \"$1\" 2> /dev/null || git checkout \"$1\"; }; f"
# Color graph log view
graph = log --graph --color --pretty=format:"%C(yellow)%H%C(green)%d%C(reset)%n%x20%cd%n%x20%cn%x20(%ce)%n%x20%s%n"
find-commit-with = "!git log --source --all --decorate -S "
last = log -1 HEAD
[push]
simple = true
[pull]
rebase = true
[merge]
ff = only
conflictstyle = diff3
[transfer]
fsckobjects = true
[core]
pager = delta
[interactive]
diffFilter = delta --color-only
[include]
path = ~/github/delta/themes.gitconfig
[delta]
dark = true
features = side-by-side line-numbers decorations colibri
[difftool]
prompt = false
[branch]
autosetuprebase = always
## -- ## -- ## --
[color "branch"]
current = yellow reverse
local = yellow
remote = green
[color "diff"]
meta = yellow bold
frag = magenta bold # line info
old = red # deletions
new = green # additions
[color "status"]
added = green
changed = yellow
untracked = cyan
[diff]
# Detect copies as well as renames
colorMoved = default
renames = copies
[merge]
# Include summaries of merged commits in newly created merge commit messages
log = true
[user]
email = [email protected]
name = Armando Perez
[core]
excludesfile = ~/.gitignore_global
[filter "lfs"]
clean = git-lfs clean -- %f
smudge = git-lfs smudge -- %f
process = git-lfs filter-process
required = true
[init]
defaultBranch = main