-
Notifications
You must be signed in to change notification settings - Fork 0
/
Copy path.gitconfig
49 lines (47 loc) · 1.36 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
[user]
email = [email protected]
name = Duffy Tilleman
[color]
ui = true
[alias]
s = status
d = diff
dc = diff --cached
unstage = reset HEAD
logp = log --pretty=fullline
logpa = log --pretty=fullline --graph --all
shelve = commit --no-verify -m 'shelve'
unshelve = reset --soft HEAD^
branches-by-date = for-each-ref --sort=-committerdate refs/heads/ --format='%(committerdate:short) %(authorname) %(refname:short)'
stash-staged = !bash -c "git commit -m 'shelve' && git add -u && git stash && git reset HEAD^"
find-merge = "!sh -c 'commit=$0 && branch=${1:-HEAD} && (git rev-list $commit..$branch --ancestry-path | cat -n; git rev-list $commit..$branch --first-parent | cat -n) | sort -k2 -s | uniq -f1 -d | sort -n | tail -1 | cut -f2'"
show-merge = "!sh -c 'merge=$(git find-merge $0 $1) && [ -n \"$merge\" ] && git show $merge'"
[core]
editor = nvim
autocrlf = false
trustctime = false
[push]
default = simple
autoSetupRemote = true
[pretty]
fullline = tformat:%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset
[difftool]
prompt = true
[merge]
tool = nvimdiff
[diff]
tool = nvimdiff
[difftool "nvimdiff"]
cmd = "nvim -d \"$LOCAL\" \"$REMOTE\""
[rebase]
autosquash = true
[grep]
extendedRegexp = true
[rerere]
enabled = true
[bulkworkspaces]
plethora = .
[init]
defaultBranch = main
# [pull]
# rebase = true