-
Notifications
You must be signed in to change notification settings - Fork 0
Expand file tree
/
Copy path.gitconfig
More file actions
107 lines (87 loc) · 2.07 KB
/
Copy path.gitconfig
File metadata and controls
107 lines (87 loc) · 2.07 KB
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
# =============================================================================
# Infrastructure repo Git configuration
# -----------------------------------------------------------------------------
# Purpose:
# Repository-specific Git defaults for the Infrastructure repo.
#
# Enable once per clone with:
# git config --local include.path ../.gitconfig
#
# Optional private overrides:
# Create .gitconfig.local in the repo root.
# =============================================================================
[include]
path = .gitconfig.local
[core]
autocrlf = false
eol = lf
whitespace = trailing-space,space-before-tab,indent-with-non-tab
ignorecase = false
[init]
defaultBranch = main
[fetch]
prune = true
pruneTags = true
all = true
[pull]
ff = only
[push]
default = current
autoSetupRemote = true
followTags = true
[branch]
sort = -committerdate
[tag]
sort = -version:refname
[diff]
algorithm = histogram
renames = copies
colorMoved = default
submodule = log
[merge]
conflictStyle = zdiff3
ff = false
[merge "ours"]
name = Keep ours merge driver
driver = true
[rerere]
enabled = true
autoupdate = true
[status]
showStash = true
submoduleSummary = true
short = false
branch = true
[log]
date = iso
decorate = short
[commit]
verbose = true
[rebase]
autoStash = true
autoSquash = true
updateRefs = true
[stash]
showIncludeUntracked = true
[clean]
requireForce = true
[advice]
addIgnoredFile = false
detachedHead = false
[alias]
s = status --short --branch
st = status
co = checkout
sw = switch
br = branch
ci = commit
amend = commit --amend
unstage = reset HEAD --
last = log -1 HEAD --stat
lg = log --graph --decorate --oneline --all
recent = branch --sort=-committerdate
cleanup = !git fetch --all --prune --prune-tags && git remote prune origin
root = rev-parse --show-toplevel
ignored = status --ignored --short
ours = checkout --ours --
theirs = checkout --theirs --