rc/gitconfig

52 lines
1.2 KiB
Text
Raw Normal View History

2020-12-23 16:39:13 +01:00
[init]
defaultBranch = dev
2015-12-12 22:45:03 +01:00
[core]
excludesfile = ~/.gitignore_global
2021-08-27 20:37:30 +02:00
[user]
useConfigOnly = true
[include]
path = ~/.git_user
[master]
2015-11-24 19:04:50 +01:00
autosetuprebase = always
[color]
2015-11-24 19:04:50 +01:00
ui = auto
[push]
default = current
2016-09-28 10:29:54 -04:00
[merge]
tool = vimdiff
conflictstyle = diff3
[alias]
# Basics
2020-11-20 19:21:54 +01:00
am = commit --amend
2020-02-19 12:15:56 -05:00
br = branch
2020-12-23 17:17:27 +01:00
c = commit
2020-02-19 12:15:56 -05:00
ck = checkout
cl = clone
cm = commit -m
cma = commit -am
2020-02-19 12:15:56 -05:00
ds = diff --staged
2020-01-20 09:58:56 -05:00
g = grep -En
2020-02-19 12:15:56 -05:00
gf = grep -Fn --
gi = grep -iFn --
st = status -s
# Tweak defaults
bra = branch -ra
# List aliases
la = "!git config -l | grep alias | cut -c 7-"
# Pretty branch graph
lg = log --oneline --abbrev-commit --all --graph --decorate --color
2018-05-17 13:28:27 -04:00
# Graph with additional info (author, date)
lga = log --graph --abbrev-commit --decorate --format=format:'%C(yellow)%h%C(reset) %C(bold red)%d%C(reset) %C(blue)[%an]%C(reset) %C(green)(%ai)%C(reset) - %C(white)%s%C(reset)' --all
# Same but also list modified files
lf = log --oneline --name-status --all --graph --decorate --color
2018-05-17 13:28:27 -04:00
# pull rebase
prb = pull --rebase
2020-06-18 21:56:07 -04:00
[status]
submoduleSummary = true
[pull]
rebase = false