diff --git a/.config/git/config b/.config/git/config index 8e1b55c..1e5970e 100644 --- a/.config/git/config +++ b/.config/git/config @@ -109,8 +109,8 @@ curbranch = symbolic-ref --short HEAD upstream = !git rev-parse --abbrev-ref --symbolic-full-name @{upstream} || git rev-parse --abbrev-ref --symbolic-full-name @{push} || echo origin/$(git curbranch) - lg = log --pretty=tformat:'%C(auto)%h%d %s %Cgreen(%cd) %Cblue<%an>%Creset' --date=human --graph - lgu = lg HEAD @{push} + lgr = log --pretty=tformat:'%C(auto)%h%d %s %Cgreen(%cd) %Cblue<%an>%Creset' --date=human --graph + lg = lgr HEAD @{push} lo = log --pretty=tformat:'%C(auto)%h%d %s %Cgreen(%cd) %Cblue<%an>%Creset' --date=human --no-merges lp = log -p --date=local my = lo --author [Jj]anek diff --git a/.config/git/config-data b/.config/git/config-data index 2182d7e..012c76b 100644 --- a/.config/git/config-data +++ b/.config/git/config-data @@ -1,4 +1,4 @@ [alias] - journal = !git add $(git root)/2-standards/notes/journal && git cme "notes/journal:" -- $(git root)/2-standards/notes/journal - note = !git cme "notes:" -- $(git root)/2-standards/notes - write = !git add $(git root)/2-standards/writing && git cme "write:" -- $(git root)/2-standards/writing + journal = !git add $(git root)/2-standards/notes/journal && git cme "notes/journal:" $(git root)/2-standards/notes/journal + note = !git cme "notes:" $(git root)/2-standards/notes + write = !git add $(git root)/2-standards/writing && git cme "write:" $(git root)/2-standards/writing