Skip to content

Commit

Permalink
chore: Update .gitconfig
Browse files Browse the repository at this point in the history
  • Loading branch information
kpatryk committed Dec 22, 2024
1 parent 752f027 commit 5c54af0
Show file tree
Hide file tree
Showing 4 changed files with 26 additions and 6 deletions.
9 changes: 9 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,17 @@ Additional tips how to distribute / publish / retrieve GPG keys can be found [he

# Resources

## Styleguides
- [Google Shell Style Guide](https://google.github.io/styleguide/shellguide.html)

## Tools
- ShellCheck - A shell script [static analysis tool](https://github.com/koalaman/shellcheck)
- shfmt - [A shell parser, formatter, and interpreter](https://github.com/mvdan/sh)

## Git
- Caching your GitHub credentials in [Git](https://docs.github.com/en/get-started/getting-started-with-git/caching-your-github-credentials-in-git)
- Updating credentials from the [macOS Keychain](https://docs.github.com/en/get-started/getting-started-with-git/updating-credentials-from-the-macos-keychain)

## TLS/SSL issues
- [Add SSL root CA](
https://help.zscaler.com/zia/adding-custom-certificate-application-specific-trust-store) to application specific trust store
19 changes: 13 additions & 6 deletions config/.gitconfig
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
[user]
name = Patryk Kubiak
email = Patryk.Kubiak@gmail.com
[includeIf "gitdir:~/ghq/github.*/"]
path = ~/.gitconfig-priv

[includeIf "gitdir:~/ghq/sourcecode.*.com/"]
path = ~/.gitconfig-work

[branch]
autosetuprebase = always
Expand Down Expand Up @@ -50,7 +52,7 @@
[core]
pager = less -r
autocrlf = input
excludesfile = /Users/kpatryk/.gitignore_global
excludesfile = ~/.gitignore_global

[help]
autocorrect = 1
Expand All @@ -61,7 +63,7 @@

[credential]
#cache credentials for 100 days
helper = cache --timeout=8640000
helper = osxkeychain

[alias]
st = status
Expand All @@ -71,7 +73,7 @@
lg1 = log --graph --abbrev-commit --decorate --date=relative --format=format:'%C(bold blue)%h%C(reset) - %C(bold green)(%ar)%C(reset) %C(white)%s%C(reset) %C(dim white)- %an%C(reset)%C(bold yellow)%d%C(reset)' --all
lg2 = log --graph --abbrev-commit --decorate --format=format:'%C(bold blue)%h%C(reset) - %C(bold cyan)%aD%C(reset) %C(bold green)(%ar)%C(reset)%C(bold yellow)%d%C(reset)%n'' %C(white)%s%C(reset) %C(dim white)- %an%C(reset)' --all
grog = log --graph --abbrev-commit --decorate --all --format=format:\"%C(bold blue)%h%C(reset) - %C(bold cyan)%aD%C(dim white) - %an%C(reset) %C(bold green)(%ar)%C(reset)%C(bold yellow)%d%C(reset)%n %C(white)%s%C(reset)\"
cam = commit -am
cam = commit -am
co = checkout
please = push --force-with-lease
it = !git init . && git commit -m 'Init commit' --allow-empty
Expand Down Expand Up @@ -147,6 +149,7 @@
last = log -10 --pretty=format:'%C(yellow)%h%Creset %C(green)%ar%Creset %s'
find-large-files = !git rev-list --objects --all | git cat-file --batch-check='%(objecttype) %(objectname) %(objectsize) %(rest)' | sed -n 's/^blob //p' | sort -rn -k2 | head -10
current-branch = rev-parse --abbrev-ref HEAD
show-details = show --pretty=format:\"Author: %an <%ae>%nCommitter: %cn <%ce>%nDate: %cd\"

[mergetool]
keepBackup = false
Expand All @@ -171,3 +174,7 @@
process = git-lfs filter-process
[fetch]
prune = true
# [credential "https://dev.azure.com"]
# useHttpPath = true
[rerere]
enabled = true
3 changes: 3 additions & 0 deletions config/.gitconfig-priv
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[user]
name = Patryk Kubiak
email = Patryk.Kubiak@gmail.com
1 change: 1 addition & 0 deletions config/.gitignore_global
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
.envrc

0 comments on commit 5c54af0

Please sign in to comment.