dotfiles/.gitconfig

80 lines
2.1 KiB
INI
Raw Normal View History

2012-11-09 20:44:06 -08:00
[user]
name = Tony Grosinger
2020-05-18 07:28:26 -07:00
email = tony@grosinger.net
2012-11-09 20:44:06 -08:00
[color]
ui = auto
2015-10-12 13:58:31 -07:00
2016-08-08 14:03:50 -07:00
[color "status"]
added = green
branch = white bold ul
changed = 9 # Bright red
unmerged = 11 # Bright yellow
untracked = 32 # Brighter blue
2012-11-09 20:44:06 -08:00
[alias]
2015-10-12 13:58:31 -07:00
co = checkout
amend = commit --amend
2022-09-23 10:23:43 -07:00
cf = commit --fixup
2016-08-08 14:03:50 -07:00
aq = commit --amend --no-edit
2015-10-12 13:58:31 -07:00
c = commit
2023-10-15 08:34:38 -07:00
pf = push --force-with-lease
2015-10-12 13:58:31 -07:00
s = status -sb
b = branch
pp = log --color --graph --pretty=format:'%Cred%h%Creset %Cgreen(%cr) %Creset\t%s %C(bold blue)<%an> %C(yellow)%d%Creset' --abbrev-commit
type = cat-file -t
dump = cat-file -p
hist = log --pretty=format:\"%C(yellow)%h %C(blue)%cd %C(red)%d %C(reset)%s %C(green)[%an]\" --decorate --graph --date=short --all
2016-08-08 14:03:50 -07:00
ri = "!f() { r=\"${1}\"; if [ \"${1}\" -eq \"${1}\" ]; then r=\"@~${1}\"; \
2017-11-07 13:41:08 -08:00
fi >/dev/null 2>&1; git rebase --autosquash -i \"${r}\"; }; f"
2020-11-04 09:45:58 -08:00
review = "!f(){ BRANCH=\"$(git rev-parse --abbrev-ref HEAD)\"; git push -u origin \"$BRANCH\":user/$USER/\"$BRANCH\" --force; }; f"
# Branch-agnostic aliases
# https://aj.codes/post/branch-agnostic-git-aliases/
default-branch = "!git symbolic-ref refs/remotes/origin/HEAD | cut -f4 -d/"
pom = push origin $(git default-branch)
merged-branches = "!git branch --merged $(git default-branch)"
sync = "!git fetch -p && git rebase origin/$(git default-branch)"
2015-10-12 13:58:31 -07:00
[core]
2015-10-12 13:58:31 -07:00
editor = vim
pager = delta
2021-07-20 10:56:36 -07:00
attributesfile = /home/tgrosinger/.gitattributes
2021-07-29 14:13:19 -07:00
excludesfile = /home/tgrosinger/.gitignore_global
2022-09-21 15:08:14 -07:00
[interactive]
diffFilter = delta --color-only
2022-09-21 15:08:14 -07:00
[push]
default = simple
[diff]
colorMoved = default
[delta]
navigate = true
light = true
side-by-side = true
line-numbers = true
2023-12-27 08:09:15 -08:00
map-styles = bold purple => syntax magenta, bold cyan => syntax blue
2015-10-12 13:58:31 -07:00
[branch]
autosetuprebase = always
2015-10-12 13:58:31 -07:00
[pull]
2021-07-29 14:13:19 -07:00
rebase = true
2015-10-12 13:58:31 -07:00
2016-08-08 14:03:50 -07:00
[log]
date = local
[status]
submoduleSummary = true
2021-07-20 10:56:36 -07:00
[url "ssh://git@gitlab.i.extrahop.com/"]
insteadOf = https://gitlab.i.extrahop.com/
2022-09-23 10:23:43 -07:00
[merge]
conflictstyle = diff3
2023-07-23 14:35:52 -07:00
[init]
defaultBranch = main