-
Notifications
You must be signed in to change notification settings - Fork 1
/
.gitconfig
71 lines (57 loc) · 1.86 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
[alias]
# Common shortcuts I use
co = checkout
ci = commit
pullr = pull --rebase
lg = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --date=relative
wd = diff --word-diff="color"
wds = diff --word-diff="color" --staged
s = status --short --branch
# Useful but less often used
authors = "!git log --pretty=format:%aN | sort | uniq -c | sort -rn"
today = log --stat --since=\"1 Day Ago\" --graph --pretty=oneline --abbrev-commit --date=relative
undo = reset --soft HEAD^
[color]
branch = auto
diff = auto
interactive = auto
status = auto
[merge]
# Include summaries of merged commits in newly created merge commit messages.
log = true
[pull]
# Rebase by default.
rebase = true
[push]
# Pushes the current branch with the same name on the remote.
default = simple
# Automatically set up default remote tracking on push.
autoSetupRemote = true
[init]
defaultBranch = main
[filter "lfs"]
required = true
clean = git-lfs clean -- %f
smudge = git-lfs smudge -- %f
process = git-lfs filter-process
[diff "sopsdiffer"]
textconv = sops -d
[difftool]
# Prompt before each invocation of the diff tool.
prompt = false
# The --gui argument must be provided for diff.guitool to be used.
guiDefault = false
[merge "npm-merge-driver"]
name = automatically merge npm lockfiles
driver = npx npm-merge-driver merge %A %O %B %P
[mergetool]
# Prompt before each invocation of the merge tool.
prompt = false
# After performing a merge, the original file with conflict markers can be saved as a file with a .orig extension.
keepBackup = false
# The --gui argument must be provided for merge.guitool to be used.
guiDefault = false
[url "[email protected]:markosamuli"]
insteadOf = https://github.com/markosamuli
[url "[email protected]:echo-health"]
insteadOf = https://github.com/echo-health