-
Notifications
You must be signed in to change notification settings - Fork 0
/
.gitconfig
139 lines (121 loc) · 4.11 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
127
128
129
130
131
132
133
134
135
136
137
138
139
[user]
email = [email protected]
name = Anthony Brien
[color]
ui = auto
# [color "branch"]
# current = yellow reverse
# local = yellow
# remote = green
[color "status"]
added = yellow
changed = green
untracked = red
[core]
editor = rider.cmd --wait
excludesfile = ~/.gitignore
# prevent warning about CRLF conversion when using zsh
safecrlf = false
autocrlf = true
longpaths = true
[pull]
rebase = true
[rebase]
autosquash = true
[alias]
# stage all
a = add -A
abort = rebase --abort
# Show all of my configured aliases
aliases = !git config --list | grep 'alias\\.' | sed 's/alias\\.\\([^=]*\\)=\\(.*\\)/\\1\\ \t => \\2/' | sort
changelog = log --pretty=format:\" * %s\"
# Detect moved or copied lines, and ignore whitespace
blame = blame -w -M -C
# Which files are receiving the most "love"
churn = !git log --all -M -C --name-only --format='format:' "$@" | sort | grep -v '^$' | uniq -c | sort | awk 'BEGIN {print "count,file"} {print $1 "," $2}'
ci = commit
co = checkout
# Show all branches
br = branch -av
# View the log and diff for a commit (previous if no SHA1 provided)
details = log -n1 -p --format=fuller
# show log history timeline of commits with their files
fh = !git log --format=format:'%C(bold cyan)%ar %C(reset) %C(green)%f' --name-status
# View a pretty git log with branch tree
#g = !git log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --date=relative
lga = log --graph --oneline --all --decorate
lg = log --graph --pretty='format:%C(yellow)%h%Cred%d%Creset %s %C(green)%an%C(bold blue), %cr' --date=short --abbrev-commit
markdownlog = log --color --pretty=format:'* %s `%Cred%h%Creset` - %C(bold blue)[%an](mailto:%ae)%Creset' --abbrev-commit --dense --no-merges --reverse
# checkout a merge request to inspect it locally.
mr = !sh -c 'git fetch $1 merge-requests/$2/head:mr-$1-$2 && git checkout mr-$1-$2' -
st = status
stats = diff --stat
# Return the repository's root directory (usefull for shell prompts)
root = rev-parse --show-toplevel
co = checkout
ci = commit
st = status
# Uncommits last commit and places it back in the staging
uncommit = reset --soft HEAD^
unstage = reset HEAD
stats = diff --stat
unstage = reset --soft HEAD --
who = shortlog -s --
wipe = !git add -A && git commit -qm 'WIPE SAVEPOINT' && git reset HEAD~1 --hard
[advice]
# statusHints = false
[url "https://github.com/"]
insteadOf = gh:
[url "https://gist.github.com/"]
insteadOf = gist:
[url "https://ubisoft.gitlab.com/"]
insteadOf = gl:
[http]
proxy = http://proxy.ubisoft.org:3128
sslVerify = true
sslBackend = schannel
[https]
proxy = http://proxy.ubisoft.org:3128
[url "https://"]
insteadOf = git://
[branch]
autosetuprebase = always
[diff]
tool = rider
[difftool]
prompt = false
[difftool "vscode"]
cmd = code --wait --diff $LOCAL $REMOTE
[difftool "araxis"]
path = C:/Program Files/Araxis/Araxis Merge/Compare.exe
[difftool "rider"]
cmd = rider.cmd diff $LOCAL $REMOTE
[merge]
tool = rider
stat = true
guitool = p4merge
summary = true
[mergetool]
keepbackup = false
prompt = true
[mergetool "araxismerge"]
cmd = \"C:\\Program Files\\Araxis\\Araxis Merge\\AraxisGitMerge.exe\" \"$PWD/$REMOTE\" \"$PWD/$BASE\" \"$PWD/$LOCAL\" \"$PWD/$MERGED\"
[mergetool "araxis"]
path = C:/Program Files/Araxis/Araxis Merge/Compare.exe
[mergetool "vscode"]
cmd = "code --wait $MERGED"
[mergetool "vsdiffmerge"]
cmd = \"C:\\Program Files\\Microsoft Visual Studio\\2022\\Professional\\Common7\\IDE\\CommonExtensions\\Microsoft\\TeamFoundation\\Team Explorer\\vsdiffmerge.exe\" \"$REMOTE\" \"$LOCAL\" \"$BASE\" \"$MERGED\" //m
keepBackup = false
trustExitCode = true
[safe]
directory = *
[credential]
helper = wincred
[credential "https://gitlab-ncsa.ubisoft.org"]
provider = generic
[winUpdater]
recentlySeenVersion = 2.18.0.windows.1
[ubisoft]
clonedirectory = E:\\git
folderstructure = flat