-
Notifications
You must be signed in to change notification settings - Fork 1
/
.gitconfig
126 lines (125 loc) · 2.88 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
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
# See `git help config` for more information
[init]
defaultBranch = main
[status]
aheadBehind = true
submoduleSummary = true
showUntrackedFiles = all
showStash = true
renames = copies
[branch]
autoSetupMerge = always
autoSetupRebase = always
sort = -committerdate
[fetch]
prune = true
writeCommitGraph = true
[pull]
rebase = true # merges
[push]
default = upstream
followTags = true
autoSetupRemote = true
[rebase]
autoStash = true
updateRefs = true
missingCommitsCheck = error
[commit]
cleanup = strip
template = ~/.gitmessage
[diff]
tool = vscode
renames = copies
mnemonicPrefix = true
submodule = log
[difftool "vscode"]
cmd = code --wait --diff "$REMOTE" "$LOCAL"
[merge]
tool = vscode
autoStash = true
[mergetool]
keepBackup = false
keepTemporaries = false
writeToTemp = true
prompt = false
[mergetool "vscode"]
cmd = code --wait --merge "$REMOTE" "$LOCAL" "$BASE" "$MERGED"
trustExitCode = true
[core]
editor = code --wait
pager = less --quit-if-one-screen
untrackedcache = true
fsmonitor = true
# whitespace = trailing-space,space-before-tab,-indent-with-non-tab,tab-in-indent,cr-at-eol
[color]
ui = auto
[column]
ui = auto
[user]
name = Vladyslav Dukhin
email = 15850680+primeare@users.noreply.github.com
[credential]
helper = osxkeychain
[grep]
break = true
heading = true
lineNumber = true
extendedRegexp = true
[log]
abbrevCommit = true
follow = true
showSignature = true
[tag]
sort = version:refname
[versionsort]
suffix = -pre
suffix = .pre
suffix = -alpha
suffix = .alpha
suffix = -beta
suffix = .beta
suffix = -rc
suffix = .rc
[rerere]
# Reuse Recorded Resolution
enabled = true
autoUpdate = true
[instaweb]
local = true
port = 4321
[alias]
# ex. (git s)
s = status
# ex. (git c)
c = commit --signoff
# ex. (git ca)
ca = commit --signoff --amend
# ex. (git co main, git co -b feature, git co -)
co = checkout
# ex. (git b)
b = branch --all
# pull without rebase
pu = pull --no-rebase --ff --signoff
# pushes changes to the remote branch of the same name
# ex. (git p)
p = push origin HEAD # use --signed flag
fp = push --force-with-lease --force-if-includes origin HEAD
# outputs the log graph of git history with statistics
# ex. (git l)
l = log --oneline --graph --decorate --date=relative --stat
# stash the changes in a dirty working directory away, include untracked
# ex. (git st "some awesome code")
st = stash push --include-untracked --message
# ex. (git stl)
stl = stash list
# outputs log that relates to a specified file
# ex. (git file-log .gitconfig)
file-log = log --follow --graph --decorate --patch --
# outputs a condensed summary of the working directory against the branch
# ex. (git summary, git summary main)
summary = diff --word-diff --compact-summary
# undo last commit but keep changes in stage
undo = reset --soft HEAD~1
# ex. (git aliases)
aliases = config --get-regexp alias
# git maintenance start