Marty/dotfiles
1
0
Fork 0
Code Issues 3 Pull requests Projects Releases Wiki Activity
dotfiles/vcs/.config/git/config

78 lines
2.9 KiB
Text
Raw Normal View History

Add global gitconfig, improve glog display Added global git config file, following XDG specifications (putting it under `XDG_CONFIG_HOME/git/config`). Adding a small improvement to default dot session for tmux, so that its log watcher now shows all refs and remote refs.
2020-02-01 10:15:22 +00:00
[user]
git: Fix whitespace formatting
2020-07-23 10:25:46 +00:00
email = marty.oehme@gmail.com
name = Marty Oehme
git: Update commit signature key
2022-10-08 15:49:00 +00:00
signingkey = 73BA40D5AFAF49C9
git: Add main branch methods, Fix pushall Fixed 'pushall' option xargs error. Added dealing with 'main' branch instead of 'master' branch in checkout and rebase aliases, so that when invoking the commands it will default to a master branch and fall back to a main branch before complaining that no corresponding branch exists. Should (silently) fix git repositories which switched to main in the last few months, and simultaneously allows me to switch this repository to main branch (already done.)
2021-03-14 12:02:47 +00:00
[init]
git: Add sendmail configuration Added configuration to use git for direct patch contributions through mail. Uses msmtp for mail agent.
2022-11-25 15:42:34 +00:00
defaultBranch = main
git: Replace dsf with git-delta Diff-so-fancy is pretty good but delta just looks soo buttery smooth.
2023-10-02 18:16:04 +00:00
[core]
git: Make git diff termcolor aware Added simple light/dark distinction for git diffs using delta. Will use the TERM_DARK env variable which is set in the base module functionality on opening a new term. This means unfortunately git diffs will have the wrong color when terms recently changed between light-dark but on opening a new one the error is gone and it automatically adapts again to the terminal background color.
2023-12-12 11:19:41 +00:00
pager = git delta
git: Add difftastic syntax diffing If difft command is installed we can git diff on syntactic changes only using `gdy` (or `gdys` for staged) which will spit out a (treesitter) syntax-aware side by side comparison. Really nice for refactoring diffs.
2023-12-12 11:15:07 +00:00
[pager]
difftool = true
git: Replace dsf with git-delta Diff-so-fancy is pretty good but delta just looks soo buttery smooth.
2023-10-02 18:16:04 +00:00
[interactive]
git: Make git diff termcolor aware Added simple light/dark distinction for git diffs using delta. Will use the TERM_DARK env variable which is set in the base module functionality on opening a new term. This means unfortunately git diffs will have the wrong color when terms recently changed between light-dark but on opening a new one the error is gone and it automatically adapts again to the terminal background color.
2023-12-12 11:19:41 +00:00
diffFilter = git delta --color-only
git: Replace dsf with git-delta Diff-so-fancy is pretty good but delta just looks soo buttery smooth.
2023-10-02 18:16:04 +00:00
[merge]
conflictstyle = diff3
[delta]
git: Make git diff termcolor aware Added simple light/dark distinction for git diffs using delta. Will use the TERM_DARK env variable which is set in the base module functionality on opening a new term. This means unfortunately git diffs will have the wrong color when terms recently changed between light-dark but on opening a new one the error is gone and it automatically adapts again to the terminal background color.
2023-12-12 11:19:41 +00:00
navigate = true
line-numbers = true
syntax-theme = base16
git: Add sendmail configuration Added configuration to use git for direct patch contributions through mail. Uses msmtp for mail agent.
2022-11-25 15:42:34 +00:00
[sendemail]
git: Fix formatting alignments
2023-08-29 20:34:19 +00:00
smtpserver = "/usr/bin/msmtp"
annotate = yes
Add basic XDG compliant sh architecture The only file left in $HOME is .zshenv, which sets up zsh to source everything from XDG_CONFIG_HOME/zsh. Shell files are split into sh and zsh directories, for global assignments (which should be posix compliant, work on any posix shell) like environemnt variables, xdg vars, and global aliases. zsh contains zsh specific customization (prompt customization, plugin loading, zsh completions). Zsh initialization will pull from sh directory first, loading the respective mirror to its startup file (`.zprofile` loads `sh/profile` and `profile.d/*`, `.zshenv` loads `sh/env` and `sh/env.d/*` and `zsh/env.d/*`, `.zshrc` loads `sh/alias`, `sh/alias.d/*` and `zsh/alias.d/*`) Once all is done, it will have loaded both global variables, aliases and settings, and zsh-only specifications. Other stow modules, if they want to add shell functionality, can include their aliases and functions in one of the above directories to automatically be picked up by zsh.
2020-02-02 15:08:40 +00:00
[alias]
[git] Clean up config formatting, color diffs Made git aliasing exit if no git executable is found (which should not happen, but still) instead of putting all aliases into the conditional. Added unified colors to git diffs. Cleaned up formatting of the files.
2020-05-28 11:29:49 +00:00
ignore = "!gitignore -f"
git: Fix whitespace formatting
2020-07-23 10:25:46 +00:00
last = "diff HEAD~ HEAD"
git: Fix formatting alignments
2023-08-29 20:34:19 +00:00
pushall = "!git remote | xargs -I R git push R" # push to all connected remotes
fetchall = "!git remote | xargs -I R git fetch R" # fetch from all connected remotes
git: Add word-wise diff as quick alias Since I often use git for prose and textual writing, wordwise diffs make a lot of sense to have quick access to. This commit sets up a git-internal alias `git diffword` as well as an even shorter `gdd` (diff) and `gdds` (diff staged) which mimic the other diff aliases `gd`/`gds` already existing.
2023-10-05 16:09:48 +00:00
diffword = "!git diff --word-diff=color --word-diff-regex='[0-9A-Za-z_]+'" # word-wise diff, good for prose
git: Add difftastic syntax diffing If difft command is installed we can git diff on syntactic changes only using `gdy` (or `gdys` for staged) which will spit out a (treesitter) syntax-aware side by side comparison. Really nice for refactoring diffs.
2023-12-12 11:15:07 +00:00
diffsyn = "!git difftool --tool difftastic" # add syntax-driven diff using treesitter
git: Add side-by-side diff Added a simple alteration of diff viewing to also be feasible side-by-side in addition to the default (delta) diff viewing mode. Use aliases `gdd` (and `gdds` for staged) to enable.
2023-12-12 11:17:19 +00:00
diffside = "!DELTA_FEATURES='+side-by-side' git diff" # add side-by-side diffing
git: Fix diff dark light setting automation
2023-12-12 15:35:55 +00:00
delta = "![ $TERM_DARK = false ] && delta --light || delta" # Take care that we always display right color scheme
[git] Fix git stash alias,set default pull options Fixed git stash alias (gsta) not correctly detecting zsh shell for git version guessing. Set default options to automatically rebase on pull, automatically prune on fetch, and automatically stash and squash on rebasing. Also made git diff highlight moved code.
2020-05-25 15:36:27 +00:00
[commit]
git: Add main branch methods, Fix pushall Fixed 'pushall' option xargs error. Added dealing with 'main' branch instead of 'master' branch in checkout and rebase aliases, so that when invoking the commands it will default to a master branch and fall back to a main branch before complaining that no corresponding branch exists. Should (silently) fix git repositories which switched to main in the last few months, and simultaneously allows me to switch this repository to main branch (already done.)
2021-03-14 12:02:47 +00:00
gpgsign = true # sign commits as me
verbose = true # Always show diff when preparing commit message
[git] Fix git stash alias,set default pull options Fixed git stash alias (gsta) not correctly detecting zsh shell for git version guessing. Set default options to automatically rebase on pull, automatically prune on fetch, and automatically stash and squash on rebasing. Also made git diff highlight moved code.
2020-05-25 15:36:27 +00:00
[fetch]
git: Add main branch methods, Fix pushall Fixed 'pushall' option xargs error. Added dealing with 'main' branch instead of 'master' branch in checkout and rebase aliases, so that when invoking the commands it will default to a master branch and fall back to a main branch before complaining that no corresponding branch exists. Should (silently) fix git repositories which switched to main in the last few months, and simultaneously allows me to switch this repository to main branch (already done.)
2021-03-14 12:02:47 +00:00
prune = true # remove references to non-existent remote branches
[git] Fix git stash alias,set default pull options Fixed git stash alias (gsta) not correctly detecting zsh shell for git version guessing. Set default options to automatically rebase on pull, automatically prune on fetch, and automatically stash and squash on rebasing. Also made git diff highlight moved code.
2020-05-25 15:36:27 +00:00
[pull]
git: Add main branch methods, Fix pushall Fixed 'pushall' option xargs error. Added dealing with 'main' branch instead of 'master' branch in checkout and rebase aliases, so that when invoking the commands it will default to a master branch and fall back to a main branch before complaining that no corresponding branch exists. Should (silently) fix git repositories which switched to main in the last few months, and simultaneously allows me to switch this repository to main branch (already done.)
2021-03-14 12:02:47 +00:00
rebase = true # always rebase on pulling, obviates merge commits
[git] Fix git stash alias,set default pull options Fixed git stash alias (gsta) not correctly detecting zsh shell for git version guessing. Set default options to automatically rebase on pull, automatically prune on fetch, and automatically stash and squash on rebasing. Also made git diff highlight moved code.
2020-05-25 15:36:27 +00:00
[diff]
git: Add main branch methods, Fix pushall Fixed 'pushall' option xargs error. Added dealing with 'main' branch instead of 'master' branch in checkout and rebase aliases, so that when invoking the commands it will default to a master branch and fall back to a main branch before complaining that no corresponding branch exists. Should (silently) fix git repositories which switched to main in the last few months, and simultaneously allows me to switch this repository to main branch (already done.)
2021-03-14 12:02:47 +00:00
colorMoved = zebra # also color stuff that has simply been moved, in a classy zebra-color
git: Add difftastic syntax diffing If difft command is installed we can git diff on syntactic changes only using `gdy` (or `gdys` for staged) which will spit out a (treesitter) syntax-aware side by side comparison. Really nice for refactoring diffs.
2023-12-12 11:15:07 +00:00
[difftool]
prompt = false
[difftool "difftastic"]
cmd = difft "$LOCAL" "$REMOTE"
git: Fix deprecated subsection config syntax Apparently marking subsections like `[section.subsection]` (toml-like) is deprecated in the configuration. This commit fixes this by using the recommended `[section "subsection"]` syntax. See: https://git-scm.com/docs/git-config#_syntax
2024-01-11 16:41:11 +00:00
[color "diff"]
[git] Clean up config formatting, color diffs Made git aliasing exit if no git executable is found (which should not happen, but still) instead of putting all aliases into the conditional. Added unified colors to git diffs. Cleaned up formatting of the files.
2020-05-28 11:29:49 +00:00
meta = "9"
frag = "magenta bold"
commit = "yellow bold"
old = "red bold"
new = "green bold"
whitespace = "red reverse"
git: Fix deprecated subsection config syntax Apparently marking subsections like `[section.subsection]` (toml-like) is deprecated in the configuration. This commit fixes this by using the recommended `[section "subsection"]` syntax. See: https://git-scm.com/docs/git-config#_syntax
2024-01-11 16:41:11 +00:00
[color "diff-highlight"]
[git] Clean up config formatting, color diffs Made git aliasing exit if no git executable is found (which should not happen, but still) instead of putting all aliases into the conditional. Added unified colors to git diffs. Cleaned up formatting of the files.
2020-05-28 11:29:49 +00:00
oldNormal = "red bold"
oldHighlight = "red bold 52"
newNormal = "green bold"
newHighlight = "green bold 22"
[git] Fix git stash alias,set default pull options Fixed git stash alias (gsta) not correctly detecting zsh shell for git version guessing. Set default options to automatically rebase on pull, automatically prune on fetch, and automatically stash and squash on rebasing. Also made git diff highlight moved code.
2020-05-25 15:36:27 +00:00
[rebase]
git: Fix whitespace formatting
2020-07-23 10:25:46 +00:00
autostash = true
autoSquash = true
[git] Fix git stash alias,set default pull options Fixed git stash alias (gsta) not correctly detecting zsh shell for git version guessing. Set default options to automatically rebase on pull, automatically prune on fetch, and automatically stash and squash on rebasing. Also made git diff highlight moved code.
2020-05-25 15:36:27 +00:00
# Make use of git urls for git{lab,hub}, but only do so for pushing
# since pulling will create troubles with some applications
[git] Substitute git for https connections When git is invoked with https for either github or gitlab then automatically switch it out to git@server.com
2020-02-20 21:47:00 +00:00
[url "git@github.com:"]
[git] Change to only ssh pushing, verbose diffs Changed url substitution to only work on pushing, so that we can always make use of ssh keys but things like pulling through rust's cargo still work. Default to verbose diffs, even though we also set it in the alias.
2020-03-03 08:43:36 +00:00
pushInsteadOf = "https://github.com/"
git: Fix whitespace formatting
2020-07-23 10:25:46 +00:00
pushInsteadOf = "http://github.com/"
pushInsteadOf = "gh:"
[git] Substitute git for https connections When git is invoked with https for either github or gitlab then automatically switch it out to git@server.com
2020-02-20 21:47:00 +00:00
[url "git@gitlab.com:"]
[git] Change to only ssh pushing, verbose diffs Changed url substitution to only work on pushing, so that we can always make use of ssh keys but things like pulling through rust's cargo still work. Default to verbose diffs, even though we also set it in the alias.
2020-03-03 08:43:36 +00:00
pushInsteadOf = "https://gitlab.com"
git: Fix whitespace formatting
2020-07-23 10:25:46 +00:00
pushInsteadOf = "http://gitlab.com"
git: Add personal git server substitutions Added automatic aliasing for my own git server pushing and pulling.
2021-12-15 16:38:10 +00:00
[url "git@git.martyoeh.me:"]
pushInsteadOf = "https://git.martyoeh.me"
pushInsteadOf = "http://git.martyoeh.me"
pushInsteadOf = "git@martyoeh.me"
pullInsteadOf = "git@martyoeh.me"
git: Add main branch methods, Fix pushall Fixed 'pushall' option xargs error. Added dealing with 'main' branch instead of 'master' branch in checkout and rebase aliases, so that when invoking the commands it will default to a master branch and fall back to a main branch before complaining that no corresponding branch exists. Should (silently) fix git repositories which switched to main in the last few months, and simultaneously allows me to switch this repository to main branch (already done.)
2021-03-14 12:02:47 +00:00
[filter "lfs"]
clean = git-lfs clean -- %f
smudge = git-lfs smudge -- %f
process = git-lfs filter-process
required = true
Reference in a new issue Copy permalink