[gitconfig] tabs -> spaces
This commit is contained in:
parent
0ae59e8afe
commit
7ccc780266
1 changed files with 23 additions and 27 deletions
50
gitconfig
50
gitconfig
|
|
@ -1,32 +1,28 @@
|
||||||
[user]
|
[user]
|
||||||
name = Sami Samhuri
|
name = Sami Samhuri
|
||||||
email = sami@samhuri.net
|
email = sami@samhuri.net
|
||||||
signingkey = 2742FC16
|
signingkey = 2742FC16
|
||||||
[alias]
|
|
||||||
l = log --graph --abbrev-commit --date=relative --pretty=format:'%Cred%h%Creset %C(yellow)%d%Creset %s %Cgreen(%an, %C(bold green)%cr%Cgreen)%Creset'
|
|
||||||
g = grep --break --heading --line-number
|
|
||||||
yolo = push --force-with-lease
|
|
||||||
[branch]
|
[branch]
|
||||||
autosetupmerge = true
|
autosetupmerge = true
|
||||||
[core]
|
[core]
|
||||||
quotepath = false
|
quotepath = false
|
||||||
whitespace = trailing-space,space-before-tab
|
whitespace = trailing-space,space-before-tab
|
||||||
excludesfile = /Users/sjs/config/gitignore
|
excludesfile = /Users/sjs/config/gitignore
|
||||||
pager = diff-so-fancy | less --tabs=4 -RFX
|
pager = diff-so-fancy | less --tabs=4 -RFX
|
||||||
attributesfile = /Users/work/.gitattributes
|
attributesfile = /Users/work/.gitattributes
|
||||||
[diff]
|
[diff]
|
||||||
mnemonicprefix = true
|
mnemonicprefix = true
|
||||||
renames = copies
|
renames = copies
|
||||||
compactionHeuristic = true
|
compactionHeuristic = true
|
||||||
renameLimit = 5000
|
renameLimit = 5000
|
||||||
colorMoved = zebra
|
colorMoved = zebra
|
||||||
[advice]
|
[advice]
|
||||||
statusHints = false
|
statusHints = false
|
||||||
pushNonFastForward = false
|
pushNonFastForward = false
|
||||||
[color]
|
[color]
|
||||||
ui = auto
|
ui = auto
|
||||||
[merge]
|
[merge]
|
||||||
stat = true
|
stat = true
|
||||||
[rebase]
|
[rebase]
|
||||||
autosquash = true
|
autosquash = true
|
||||||
[difftool]
|
[difftool]
|
||||||
|
|
@ -34,10 +30,10 @@
|
||||||
[difftool "FileMerge"]
|
[difftool "FileMerge"]
|
||||||
cmd = opendiff \"$LOCAL\" \"$REMOTE\"
|
cmd = opendiff \"$LOCAL\" \"$REMOTE\"
|
||||||
[credential]
|
[credential]
|
||||||
helper = osxkeychain
|
helper = osxkeychain
|
||||||
[grep]
|
[grep]
|
||||||
extendRegexp = true
|
extendRegexp = true
|
||||||
lineNumber = true
|
lineNumber = true
|
||||||
[merge "mergepbx"]
|
[merge "mergepbx"]
|
||||||
name = XCode project files merger
|
name = XCode project files merger
|
||||||
driver = mergepbx %O %A %B
|
driver = mergepbx %O %A %B
|
||||||
|
|
@ -46,10 +42,10 @@
|
||||||
[submodule]
|
[submodule]
|
||||||
fetchJobs = 4
|
fetchJobs = 4
|
||||||
[init]
|
[init]
|
||||||
defaultBranch = main
|
defaultBranch = main
|
||||||
[gpg]
|
[gpg]
|
||||||
program = /usr/local/bin/gpg
|
program = /usr/local/bin/gpg
|
||||||
[commit]
|
[commit]
|
||||||
gpgsign = true
|
gpgsign = true
|
||||||
[diff "swift"]
|
[diff "swift"]
|
||||||
xfuncname = ^[ \t]*(((private |public |internal |final |open )*class|(private |public |internal )*struct|(private |public |internal )*actor|(private |public |internal )*func|(private |public |internal )*extension|(private |public |internal )*enum)[ \t].*)$
|
xfuncname = ^[ \t]*(((private |public |internal |final |open )*class|(private |public |internal )*struct|(private |public |internal )*actor|(private |public |internal )*func|(private |public |internal )*extension|(private |public |internal )*enum)[ \t].*)$
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue