-
Notifications
You must be signed in to change notification settings - Fork 0
/
Copy pathgitconfig
106 lines (103 loc) · 3.17 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
[user]
name = Ammar Alakkad
email = am.alakkad@gmail.com
[color]
ui = true
[push]
default = current
followTags = true
[branch]
sort=-committerdate
[status]
showUntrackedFiles = all
[pager]
diff = delta
show = delta
[core]
# Use custom `.gitignore` and `.gitattributes`
excludesfile = ~/.gitignore
pager = delta
ignorecase = false
fsmonitor = true
[interactive]
diffFilter = delta --color-only --features=interactive
[merge]
conflictstyle = diff3
[difftool]
prompt = false
keepBackup = false
[difftool "nvim"]
cmd = nvim -d -c "wincmd l" -c "norm ]c" "$LOCAL" "$MERGED" "$REMOTE"
[merge]
ff = false
conflictstyle = diff3
tool = nvim
[mergetool]
prompt = false
keepBackup = false
[mergetool "nvim"]
cmd = "nvim -d $MERGED $LOCAL $BASE $REMOTE -c 'wincmd J | wincmd ='"
[diff]
colorMoved = default
[alias]
prune = fetch --prune
glog = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset'
main-branch = !git symbolic-ref refs/remotes/origin/HEAD --short | cut -d "/" -f 2
main = !git switch $(git symbolic-ref refs/remotes/origin/HEAD --short | cut -d "/" -f 2)
append = commit --amend --no-edit
mr = !git fetch $1 merge-requests/$2/head:mr-$1-$2 && git checkout mr-$1-$2 -
cb = !git checkout $(git branch | fzf | tr -d "[:space:]")
standup = !git log --reverse --branches --since=yesterday --author=$(git config --get user.email) --format=format:'-%Creset %s' --date=local | grep -v 'Assets generate' | grep -v 'Merge'
recent = branch --sort=-committerdate --format="%(committerdate:relative)%09%(refname:short)"
affected = !git --no-pager diff --name-only $(git rev-parse HEAD) $(git rev-parse HEAD~1)
db = "!f() { branch=$(git branch --list | grep -v 'main\\|master' | grep -v '^\\*' | sed 's/^[[:space:]]*//' | fzf --prompt='Delete branch: ' --reverse); if [ -n "$branch" ]; then git branch -D "$branch"; fi; }; f"
delete-current-switch-main="!d() { branch=$(git branch --show-current); if [ -n \"$branch\" ]; then git main; git branch -D \"$branch\"; fi; }; d"
[gc]
autoDetach = false
[color "diff-highlight"]
oldNormal = red bold
oldHighlight = red bold 52
newNormal = green bold
newHighlight = green bold 22
[color "diff"]
meta = yellow
frag = magenta bold
commit = yellow bold
old = red bold
new = green bold
whitespace = red reverse
[filter "lfs"]
clean = git-lfs clean -- %f
smudge = git-lfs smudge -- %f
process = git-lfs filter-process
required = true
[pull]
rebase = false
ff = true
[rebase]
autosquash = true
instructionFormat = (%ar) %<|(120)%s <%an>
[init]
defaultBranch = main
[delta]
line-numbers = true
side-by-side = true
; line-numbers-left-format = ""
; line-numbers-right-format = "│ "
; minus-style = "syntax bold #ef5350"
; plus-style = "syntax bold #99b76d"
syntax-theme = Catppuccin-Frappe
# The contents of this file are included only for GitLab.com URLs
[includeIf "hasconfig:remote.*.url:https://gitlab.com/**"]
path = ~/.gitconfig-gitlab
[rerere]
enabled = true
[column]
ui = auto
[maintenance]
repo = /Users/aalakkad/projects/gitlab-development-kit/gitlab
repo = /Users/aalakkad/projects/gitlab-development-kit
[index]
version = 4
[advice]
detachedHead = false