dotfiles/gitconfig

96 lines
3.8 KiB
Plaintext
Raw Normal View History

[include]
path = ~/.gitconfig.platform
path = ~/.gitconfig.private
[init]
defaultBranch = master
2013-04-21 23:36:08 +00:00
[merge]
summary = true
2013-05-08 02:34:57 +00:00
tool = vimdiff
[core]
2016-10-23 16:44:54 +00:00
excludesfile = ~/.gitignore
hookspath = ~/.git_hooks
2019-12-31 05:38:46 +00:00
preloadindex = true
fscache = true
2022-06-16 17:58:24 +00:00
editor = vim
2013-05-08 02:34:57 +00:00
[push]
2015-10-16 05:09:39 +00:00
default = upstream
2021-08-22 17:49:24 +00:00
[pull]
# Use new merge-ort strategy.
twohead = ort
# rebase when pulling instead of doing a default merge.
rebase = true
[fetch]
# Run 'git remote prune' after fetching.
prune = true
2013-05-08 02:34:57 +00:00
[diff]
2015-10-16 05:09:39 +00:00
algorithm = patience
2012-04-19 14:23:13 +00:00
[color]
2013-04-21 23:36:08 +00:00
diff = auto
status = auto
branch = auto
interactive = auto
ui = true
pager = true
[color "branch"]
current = yellow reverse
local = yellow
remote = green
[color "diff"]
meta = blue
frag = magenta
old = red
new = green
2015-10-16 05:09:39 +00:00
[filter "lfs"]
clean = git-lfs clean -- %f
smudge = git-lfs smudge -- %f
2015-10-16 05:09:39 +00:00
required = true
process = git-lfs filter-process
2015-10-16 05:09:39 +00:00
[alias]
2022-02-21 02:17:09 +00:00
start = !git init && git commit --allow-empty -m \"Initial commit\"
2020-05-04 17:23:17 +00:00
2022-02-21 02:17:09 +00:00
####################
# Logging
####################
2020-05-04 17:23:17 +00:00
2022-02-21 02:17:09 +00:00
# Note: There are two timestamp values in the log. The first (%ad) is the author's timestamp
# and the second (%ci, %cs, %cr, etc) is the committer's timestamp. This lets you see the
# original commit date and the last time the commit sha changed from a history modification
# operation, e.g. modifying a commit in a rebase.
2020-05-04 17:23:17 +00:00
2022-02-21 02:17:09 +00:00
# Note: If you want a grey that's slightly darker than %C(white dim) then try `%C(black bold)`.
2020-05-04 17:23:17 +00:00
2022-02-21 02:17:09 +00:00
# Preferred style:
# * Good for history with merge commits.
# * Dates are YYYY-MM-DD format.
# * Can also use: --date=relative and replace %ci with %cr
# --date=iso and replace %ci with %ci
lg = log --graph --date=short --pretty=format:'%C(yellow bold)%h %Creset%C(yellow dim)%an %Creset%C(yellow bold)| %Creset%C(white bold)%s %C(white dim)[%ad|%cs] %Creset%C(yellow bold)%D %Creset%C(cyan bold)%<(10,trunc)%GK%Creset'
2020-05-04 17:23:17 +00:00
2022-02-21 02:17:09 +00:00
# Good for flat history:
# lg = log --graph --date=short --pretty=format:'%C(yellow bold)%h %Creset%C(yellow dim)%an %Creset%C(yellow bold)| %Creset%C(white bold)%<(78,trunc)%s %C(white dim)[%ad|%cs] %Creset%C(yellow bold)%D %Creset%C(cyan bold)%<(10,trunc)%GK%Creset'
2020-05-04 17:23:17 +00:00
2022-02-21 02:17:09 +00:00
# Alternative styles:
2020-05-04 17:23:17 +00:00
2022-02-21 02:17:09 +00:00
# name | msg
#lg = log --graph --date=short --pretty=format:'%C(yellow bold)%h %Creset%an %C(white dim)| %Creset%C(white bold)%s %Creset%C(white dim)[%ad|%cs] %Creset%C(yellow bold)%D %Creset%C(cyan bold)%<(10,trunc)%GK%Creset'
#lg = log --graph --date=short --pretty=format:'%C(yellow bold)%h %Creset%an %C(yellow bold)| %Creset%C(white bold)%s %Creset%C(white dim)[%ad|%cs] %Creset%C(yellow bold)%D %Creset%C(cyan bold)%<(10,trunc)%GK%Creset'
2020-05-04 17:23:17 +00:00
2022-02-21 02:17:09 +00:00
# name > msg
#lg = log --graph --date=short --pretty=format:'%C(yellow bold)%h %Creset%an %C(yellow bold)>%Creset %C(white bold)%s %Creset%C(white dim)[%ad|%cs] %Creset%C(yellow bold)%D %Creset%C(cyan bold)%<(10,trunc)%GK%Creset'
#lg = log --graph --date=short --pretty=format:'%C(yellow bold)%h %C(white dim)%an %Creset%C(yellow bold)> %Creset%C(white bold)%s %Creset%C(white dim)[%ad|%cs] %Creset%C(yellow bold)%D %Creset%C(cyan bold)%<(10,trunc)%GK%Creset'
#lg = log --graph --date=short --pretty=format:'%C(yellow bold)%h %Creset%C(yellow dim)%an %Creset%C(yellow bold)> %Creset%C(white bold)%s %Creset%C(white dim)[%ad|%cs] %Creset%C(yellow bold)%D %Creset%C(cyan bold)%<(10,trunc)%GK%Creset'
2020-05-04 17:23:17 +00:00
2022-02-21 02:17:09 +00:00
# <name> msg
#lg = log --graph --date=short --pretty=format:'%C(yellow bold)%h %Creset<%an> %Creset%C(white bold)%s %Creset%C(white dim)[%ad|%cs] %Creset%C(yellow bold)%D %Creset%C(cyan bold)%<(10,trunc)%GK%Creset'
# [name] msg
#lg = log --graph --date=short --pretty=format:'%C(yellow bold)%h %Creset%C(white dim)[%Creset%an%Creset%C(white dim)] %Creset%C(white bold)%s %C(white dim)[%ad|%cs] %Creset%C(yellow bold)%D %Creset%C(cyan bold)%<(10,trunc)%GK%Creset'
2020-05-04 17:23:17 +00:00
2015-10-16 05:09:39 +00:00
[rerere]
enabled = true
2019-12-31 05:38:46 +00:00
[gc]
auto = 0
2020-02-28 19:11:29 +00:00
[advice]
detachedHead = false