diff --git a/.gitconfig b/.gitconfig index e207bd2..2ce3041 100644 --- a/.gitconfig +++ b/.gitconfig @@ -38,12 +38,18 @@ fs = fuzzy status pu = "!git push --set-upstream origin $(git symbolic-ref --short HEAD)" rbi = rebase --interactive +sl = branchless smartlog +sync = branchless sync +bco = branchless checkout +c = branchless checkout + + ll = log --graph --date=relative --topo-order --pretty='format:%C(yellow)%h%C(yellow)%d %Cblue%ar %Cgreenby %an%Creset -- %s' lla = log --graph --date=relative --topo-order --pretty='format:%Cgreen%h %Cblue%ar %Credby %an%Creset -- %s' --all gl = log --decorate --graph --abbrev-commit --color --color-words --topo-order --pretty=medium gla = log --decorate --graph --abbrev-commit --color --color-words --topo-order --pretty=medium --all -sl = log --decorate --graph --abbrev-commit --color --topo-order --pretty=oneline -sla = log --decorate --graph --abbrev-commit --color --topo-order --pretty=oneline --all +#sl = log --decorate --graph --abbrev-commit --color --topo-order --pretty=oneline +#sla = log --decorate --graph --abbrev-commit --color --topo-order --pretty=oneline --all #lg = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr)%Creset' --abbrev-commit --date=relative plog = !GIT_PAGER='less -n +/^commit\\ \\[0-9a-f\\]+' git log --color --patch-with-stat lg = !"git lg1" @@ -119,10 +125,11 @@ concurrenttransfers = 32 required = true [diff] - tool = difftastic + tool = difft + # external = difft [difftool] prompt = false -[difftool "difftastic"] - cmd = difft "$LOCAL" "$REMOTE" +[difftool "difft"] + cmd = difft --display inline "$LOCAL" "$REMOTE"