Marty/dotfiles
1
0
Fork 0
Code Issues 3 Pull requests Projects Releases Wiki Activity

git: Fix whitespace formatting

Browse source
This commit is contained in:
Marty Oehme 2020-07-23 12:25:46 +02:00
parent 5640194504
commit d3fbe7f4d6
No known key found for this signature in database
GPG key ID: 0CCB0526EFB9611A
1 changed files with 19 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
git/.config/git/config
View file

@ -1,28 +1,28 @@
[user] [user]
email = marty.oehme@gmail.com email = marty.oehme@gmail.com
name = Marty Oehme name = Marty Oehme
signingkey = 0CCB0526EFB9611A signingkey = 0CCB0526EFB9611A
[filter "lfs"] [filter "lfs"]
clean = git-lfs clean -- %f clean = git-lfs clean -- %f
smudge = git-lfs smudge -- %f smudge = git-lfs smudge -- %f
process = git-lfs filter-process process = git-lfs filter-process
required = true required = true
[alias] [alias]
ignore = "!gitignore -f" ignore = "!gitignore -f"
pushmerge = "push -o merge_request.merge_when_pipeline_succeeds" # see https://docs.gitlab.com/ce/user/project/push_options.html#merge-when-pipeline-succeeds-alias pushmerge = "push -o merge_request.merge_when_pipeline_succeeds" # see https://docs.gitlab.com/ce/user/project/push_options.html#merge-when-pipeline-succeeds-alias
last = "diff HEAD HEAD~" last = "diff HEAD~ HEAD"
[commit] [commit]
# sign commits as me # sign commits as me
gpgsign = true gpgsign = true
# Always show diff when preparing commit message # Always show diff when preparing commit message
verbose = true verbose = true
[fetch] [fetch]
# remove references to non-existent remote branches # remove references to non-existent remote branches
prune = true prune = true
[pull] [pull]
rebase = true # always rebase on pulling, obviates merge commits rebase = true # always rebase on pulling, obviates merge commits
[diff] [diff]
colorMoved = zebra # also color stuff that has simply been moved, in a classy zebra-color colorMoved = zebra # also color stuff that has simply been moved, in a classy zebra-color
[pager] [pager]
diff = dsf | less --tabs=4 -RFXS --pattern '(^(Date|added|deleted|modified): |^diff --git )' diff = dsf | less --tabs=4 -RFXS --pattern '(^(Date|added|deleted|modified): |^diff --git )'
[color.diff] [color.diff]
@ -38,14 +38,14 @@
newNormal = "green bold" newNormal = "green bold"
newHighlight = "green bold 22" newHighlight = "green bold 22"
[rebase] [rebase]
autostash = true autostash = true
autoSquash = true autoSquash = true
# Make use of git urls for git{lab,hub}, but only do so for pushing # Make use of git urls for git{lab,hub}, but only do so for pushing
# since pulling will create troubles with some applications # since pulling will create troubles with some applications
[url "git@github.com:"] [url "git@github.com:"]
pushInsteadOf = "https://github.com/" pushInsteadOf = "https://github.com/"
pushInsteadOf = "http://github.com/" pushInsteadOf = "http://github.com/"
pushInsteadOf = "gh:" pushInsteadOf = "gh:"
[url "git@gitlab.com:"] [url "git@gitlab.com:"]
pushInsteadOf = "https://gitlab.com" pushInsteadOf = "https://gitlab.com"
pushInsteadOf = "http://gitlab.com" pushInsteadOf = "http://gitlab.com"