update gitconfig with git core dev defaults
parent
ab2d0f89bf
commit
b3397de7b6
|
@ -207,40 +207,18 @@ cat <<EOF >"$HOME/.gitconfig"
|
||||||
[include]
|
[include]
|
||||||
path = "~/.config/themes.gitconfig"
|
path = "~/.config/themes.gitconfig"
|
||||||
|
|
||||||
[push]
|
|
||||||
default = simple
|
|
||||||
|
|
||||||
[user]
|
|
||||||
name = Andrew Coleman
|
|
||||||
email = penguincoder@gmail.com
|
|
||||||
|
|
||||||
[advice]
|
[advice]
|
||||||
detachedHead = false
|
detachedHead = false
|
||||||
|
|
||||||
[core]
|
[alias]
|
||||||
filemode = true
|
logp = log --pretty=format:'%h %ad | %s%d [%an]' --graph --date=short
|
||||||
eol = lf
|
lg = log --graph --date-order --first-parent --pretty=format:'%C(auto)%h%Creset %C(auto)%d%Creset %s %C(green)(%ad) %C(bold cyan)<%an>%Creset'
|
||||||
autocrlf = input
|
lgb = log --graph --date-order --branches --first-parent --pretty=format:'%C(auto)%h%Creset %C(auto)%d%Creset %s %C(green)(%ad) %C(bold cyan)<%an>%Creset'
|
||||||
pager = delta
|
lga = log --graph --date-order --all --pretty=format:'%C(auto)%h%Creset %C(auto)%d%Creset %s %C(green)(%ad) %C(bold cyan)<%an>%Creset'
|
||||||
|
branches-last-updated = branch -rv --sort=committerdate --format='%(HEAD) %(color:green)%(committerdate:relative)%(color:reset)\t%(color:magenta)%(authorname)%(color:reset)\t%(color:yellow)%(refname:short)%(color:reset)'
|
||||||
|
|
||||||
[init]
|
[branch]
|
||||||
defaultBranch = main
|
sort = -committerdate
|
||||||
|
|
||||||
[delta]
|
|
||||||
line-numbers = true
|
|
||||||
file-style = omit
|
|
||||||
hunk-header-style = file
|
|
||||||
|
|
||||||
[rebase]
|
|
||||||
autoStash = true
|
|
||||||
|
|
||||||
[merge]
|
|
||||||
tool = vimdiff
|
|
||||||
conflictstyle = diff3
|
|
||||||
prompt = false
|
|
||||||
|
|
||||||
[pull]
|
|
||||||
rebase = true
|
|
||||||
|
|
||||||
[color]
|
[color]
|
||||||
branch = auto
|
branch = auto
|
||||||
|
@ -258,16 +236,69 @@ cat <<EOF >"$HOME/.gitconfig"
|
||||||
changed = green
|
changed = green
|
||||||
untracked = red
|
untracked = red
|
||||||
|
|
||||||
[alias]
|
[column]
|
||||||
logp = log --pretty=format:'%h %ad | %s%d [%an]' --graph --date=short
|
ui = auto
|
||||||
lg = log --graph --date-order --first-parent \
|
|
||||||
--pretty=format:'%C(auto)%h%Creset %C(auto)%d%Creset %s %C(green)(%ad) %C(bold cyan)<%an>%Creset'
|
[commit]
|
||||||
lgb = log --graph --date-order --branches --first-parent \
|
verbose = true
|
||||||
--pretty=format:'%C(auto)%h%Creset %C(auto)%d%Creset %s %C(green)(%ad) %C(bold cyan)<%an>%Creset'
|
|
||||||
lga = log --graph --date-order --all \
|
[core]
|
||||||
--pretty=format:'%C(auto)%h%Creset %C(auto)%d%Creset %s %C(green)(%ad) %C(bold cyan)<%an>%Creset'
|
filemode = true
|
||||||
up = pull --rebase
|
eol = lf
|
||||||
branches-last-updated = branch -rv --sort=committerdate --format='%(HEAD) %(color:green)%(committerdate:relative)%(color:reset)\t%(color:magenta)%(authorname)%(color:reset)\t%(color:yellow)%(refname:short)%(color:reset)'
|
autocrlf = input
|
||||||
|
pager = delta
|
||||||
|
# enable for large repositories
|
||||||
|
# fsmonitor = true
|
||||||
|
# untrackedCache = true
|
||||||
|
|
||||||
|
[delta]
|
||||||
|
line-numbers = true
|
||||||
|
file-style = omit
|
||||||
|
hunk-header-style = file
|
||||||
|
|
||||||
|
[diff]
|
||||||
|
algorithm = histogram
|
||||||
|
colorMoved = plain
|
||||||
|
mnemonicPrefix = true
|
||||||
|
refnames = true
|
||||||
|
|
||||||
|
[fetch]
|
||||||
|
prune = true
|
||||||
|
pruneTags = true
|
||||||
|
all = true
|
||||||
|
|
||||||
|
[help]
|
||||||
|
autocorrect = prompt
|
||||||
|
|
||||||
|
[init]
|
||||||
|
defaultBranch = main
|
||||||
|
|
||||||
|
[merge]
|
||||||
|
conflictstyle = zdiff3
|
||||||
|
|
||||||
|
[pull]
|
||||||
|
rebase = true
|
||||||
|
|
||||||
|
[push]
|
||||||
|
default = simple
|
||||||
|
autoSetupRemote = true
|
||||||
|
followTags = true
|
||||||
|
|
||||||
|
[rebase]
|
||||||
|
autoStash = true
|
||||||
|
autoSquash = true
|
||||||
|
updateRefs = true
|
||||||
|
|
||||||
|
[rerere]
|
||||||
|
enabled = true
|
||||||
|
autoupdate = true
|
||||||
|
|
||||||
|
[tag]
|
||||||
|
sort = version:refname
|
||||||
|
|
||||||
|
[user]
|
||||||
|
name = Andrew Coleman
|
||||||
|
email = penguincoder@gmail.com
|
||||||
EOF
|
EOF
|
||||||
|
|
||||||
cat <<EOF >"$HOME/.tmux.conf"
|
cat <<EOF >"$HOME/.tmux.conf"
|
||||||
|
|
Loading…
Reference in New Issue