Merged
Conversation
Adds the previously-host-local [pager], [interactive], [delta], [core], and [push] blocks under dotfiles management so the diff system reproduces on a fresh checkout. git's XDG config (.config/git/config) is read before ~/.gitconfig, so ~/.gitconfig retains only the [user] identity (host-local), and the delta wiring lands on every host that runs `make install`. Prerequisite for the [delta] block to take effect: `brew install git-delta` on macOS, or the equivalent on other OSes. If delta is missing, the [pager]/[interactive] entries that invoke it will error — to be addressed separately if/when arch hosts need this config. Related to tamakiii/meta#890
tamakiii-doppelganger
Bot
added
enhancement
tamakiii/dotfiles
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
.config/git/configto dotfiles management. git's XDG config path (~/.config/git/config) is already symlinked into dotfiles via the existing Makefile target — this PR populates it with the previously-host-local[core],[pager],[interactive],[delta], and[push]blocks.git diff/show/log -pplus standalonecat foo.diff | delta) reproduces on a fresh host aftermake installinstead of requiring manual~/.gitconfigedits per machine.~/.gitconfignow retains only the[user]identity (host-local). git's source ordering (XDG first,~/.gitconfiglast) lets the per-host identity sit alongside the shared base without an explicitinclude.pathdirective.Prerequisites on consuming hosts
git-deltainstalled (e.g.brew install git-deltaon macOS). Without it, the[pager]/[interactive]entries that invokedeltawill fail. Per-OS conditional inclusion isn't part of this PR — to be addressed if/when arch hosts adopt this config (out of scope per tamakiii/meta#890).Test plan
git log -pandgit diffcontinue to render with delta defaults (raw---/+++/@@headers, red/green line backgrounds with word-level emphasis, no syntax-theme overlay).git config --show-origin --get core.editorreturns~/.config/git/config(not~/.gitconfig), confirming the dotfiles-managed file is the active source.brew install git-delta, clone dotfiles,make install, andgit log -pworks without further~/.gitconfigedits beyond the[user]block.Related to tamakiii/meta#890