@@ -7,10 +7,9 @@
[alias]
g = log -n20 --all --color --graph --pretty=format:'%C(auto)%h%C(auto)%d%C(reset) %C(dim green)(%cr)%C(reset) -- %C(white)%s'
graph = log --all --color --graph --pretty=format:'%C(auto)%h%C(auto)%d%C(reset) %C(green)(%cr)%C(reset)%n %C(white)%s %C(bold black)--%an%C(reset) %C(red)%G?%C(reset)%w(0,6,6)%+b'
lg1 = log --graph --abbrev-commit --decorate --format=format:'%C(auto)%h%C(reset) -%C(auto)%d%C(reset) %C(bold green)(%ar)%C(reset) %C(white)%s%C(reset) %C(dim white)- %an%C(reset)' --all
lg = !'git lg1'
gl = !'git lg1'
gl = log --graph --abbrev-commit --decorate --format=format:'%C(auto)%h%C(reset) -%C(auto)%d%C(reset) %C(bold green)(%ar)%C(reset) %C(white)%s%C(reset) %C(dim white)- %an%C(reset)' --all
co = checkout
commit-to = !git commit && read -p \"New branch name: \" newbranch && git checkout -b $newbranch && git checkout main && git reset --mixed HEAD^
st = status
s = status
mt = mergetool
@@ -28,8 +27,7 @@
f = fetch
fa = fetch --all
sw = switch
[merge]
tool = meld
stgd = diff --cached
[core]
editor = nvim
[commit]
@@ -42,3 +40,5 @@
algorithm = histogram
[init]
defaultBranch = main
[pull]
ff = only