Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,20 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [Unreleased]

## [1.6.2] - 2026-05-06

### Fixed
- `git/.gitconfig`: removed private `[user]`, `[credential *]`, and `[url *]`
sections that were committed to the public repo. These belong in
`~/.gitconfig.local`, which is already included at the end of `.gitconfig`
and is never tracked by git. Also moved `[pull]`, `[rebase]`, `[fetch]`,
and `[diff]` tool settings above the `[include]` line so local settings can
override them.

### Added
- `git/.gitconfig.local.example`: template showing the structure for
`~/.gitconfig.local` (user identity, credential helpers, URL rewrites).

## [1.6.1] - 2026-05-06

### Fixed
Expand Down
1 change: 1 addition & 0 deletions CLAUDE.md
Original file line number Diff line number Diff line change
Expand Up @@ -269,6 +269,7 @@ already at the highest dotfiles-managed PATH priority.
| `nvim/.config/nvim` | `~/.config/nvim` (directory symlink) |
| `git/.gitconfig` | `~/.gitconfig` |
| `git/.gitattributes` | `~/.gitattributes` |
| `git/.gitconfig.local.example` | reference only — copy to `~/.gitconfig.local` and fill in name/email/credentials (never committed; included at end of `.gitconfig` so it can override anything) |
| `ripgrep/rc` | `~/.config/ripgrep/rc` |
| `ranger/rc.conf`, `rifle.conf`, `scope.sh`, `commands*.py` | `~/.config/ranger/` (individual files) |
| `x11/.xprofile` | `~/.xprofile` |
Expand Down
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.6.1
1.6.2
21 changes: 3 additions & 18 deletions git/.gitconfig
Original file line number Diff line number Diff line change
Expand Up @@ -50,11 +50,6 @@
[merge]
conflictstyle = zdiff3

[include]
path = ~/.gitconfig.local
[user]
name = Wojciech Pędzimąż
email = wojciech.pedzimaz@techmo.pl
[pull]
rebase = true
[rebase]
Expand All @@ -63,16 +58,6 @@
prune = true
[diff]
tool = vimdiff
[credential "https://gitlab.gnome.org"]
helper =
helper = !/usr/bin/glab auth git-credential
[credential "https://github.com"]
helper =
helper = !/usr/bin/gh auth git-credential
[credential "https://gist.github.com"]
helper =
helper = !/usr/bin/gh auth git-credential
[url "https://gitlab.devtechmo.pl/"]
insteadOf = git@gitlab.devtechmo.pl:
[credential "https://gitlab.devtechmo.pl"]
helper = !/usr/bin/glab auth git-credential

[include]
path = ~/.gitconfig.local
29 changes: 29 additions & 0 deletions git/.gitconfig.local.example
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
# ~/.gitconfig.local — machine-specific git settings (never committed)
#
# Copy this file to ~/.gitconfig.local and fill in your values.
# It is included at the end of git/.gitconfig so it can override anything.
#
# Minimum required:
#
# [user]
# name = Your Name
# email = you@example.com
#
# Credential helpers (add only what you have installed):
#
# [credential "https://github.com"]
# helper =
# helper = !/path/to/gh auth git-credential
#
# [credential "https://gist.github.com"]
# helper =
# helper = !/path/to/gh auth git-credential
#
# [credential "https://gitlab.example.com"]
# helper =
# helper = !/path/to/glab auth git-credential
#
# URL rewrites (e.g. to force HTTPS for a specific host):
#
# [url "https://gitlab.example.com/"]
# insteadOf = git@gitlab.example.com:
Loading