diff --git a/git/.config/git/config b/git/.config/git/config index 4114922..1e498ab 100644 --- a/git/.config/git/config +++ b/git/.config/git/config @@ -1,28 +1,28 @@ [user] - email = marty.oehme@gmail.com - name = Marty Oehme - signingkey = 0CCB0526EFB9611A + email = marty.oehme@gmail.com + name = Marty Oehme + signingkey = 0CCB0526EFB9611A [filter "lfs"] - clean = git-lfs clean -- %f - smudge = git-lfs smudge -- %f - process = git-lfs filter-process - required = true + clean = git-lfs clean -- %f + smudge = git-lfs smudge -- %f + process = git-lfs filter-process + required = true [alias] 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 - last = "diff HEAD HEAD~" + last = "diff HEAD~ HEAD" [commit] # sign commits as me - gpgsign = true - # Always show diff when preparing commit message - verbose = true + gpgsign = true + # Always show diff when preparing commit message + verbose = true [fetch] # remove references to non-existent remote branches - prune = true + prune = true [pull] - rebase = true # always rebase on pulling, obviates merge commits + rebase = true # always rebase on pulling, obviates merge commits [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] diff = dsf | less --tabs=4 -RFXS --pattern '(^(Date|added|deleted|modified): |^diff --git )' [color.diff] @@ -38,14 +38,14 @@ newNormal = "green bold" newHighlight = "green bold 22" [rebase] - autostash = true - autoSquash = true + autostash = true + autoSquash = true # Make use of git urls for git{lab,hub}, but only do so for pushing # since pulling will create troubles with some applications [url "git@github.com:"] pushInsteadOf = "https://github.com/" - pushInsteadOf = "http://github.com/" - pushInsteadOf = "gh:" + pushInsteadOf = "http://github.com/" + pushInsteadOf = "gh:" [url "git@gitlab.com:"] pushInsteadOf = "https://gitlab.com" - pushInsteadOf = "http://gitlab.com" + pushInsteadOf = "http://gitlab.com"