dln/dotfiles
0
0
Code Issues Pull requests 1 Activity

git: set up git-branchless aliases

Browse source
This commit is contained in:
Daniel Lundin 2022-09-10 10:53:41 +02:00
parent 9d87df404f
commit 139be399b8
1 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
.gitconfig
View file

@ -38,12 +38,18 @@ fs = fuzzy status
pu = "!git push --set-upstream origin $(git symbolic-ref --short HEAD)" pu = "!git push --set-upstream origin $(git symbolic-ref --short HEAD)"
rbi = rebase --interactive 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' 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 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 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 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 #sl = log --decorate --graph --abbrev-commit --color --topo-order --pretty=oneline
sla = log --decorate --graph --abbrev-commit --color --topo-order --pretty=oneline --all #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 #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 plog = !GIT_PAGER='less -n +/^commit\\ \\[0-9a-f\\]+' git log --color --patch-with-stat
lg = !"git lg1" lg = !"git lg1"
@ -119,10 +125,11 @@ concurrenttransfers = 32
required = true required = true
[diff] [diff]
tool = difftastic tool = difft
# external = difft
[difftool] [difftool]
prompt = false prompt = false
[difftool "difftastic"] [difftool "difft"]
cmd = difft "$LOCAL" "$REMOTE" cmd = difft --display inline "$LOCAL" "$REMOTE"