psi-jack/zimfw
1
0
Fork 0
mirror of synced 2024-11-26 17:25:35 -05:00
Code Issues Releases Wiki Activity

[git] Remove glb alias and add glO

Browse source 
as there's actually no "brief" format originally in git (by "originally"
I mean the ones listed for `--format=<format>` in the `git log` help).
Also, we already fit all the information that `glb` had in the `glG`.
So add `glO`, that is a one-line variant of `glG` (which displays in
graph format). Now we get nice symmetrical formats in `glg`/`glG` and
`glo`/`glO`.
This commit is contained in:
Eric Nielsen 2018-01-13 17:56:20 -05:00
parent 783b4dba45
commit 370543282b
2 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
modules/git/README.md
View file

@ -100,11 +100,11 @@ Aliases
- `gls` displays the stats log. - `gls` displays the stats log.
- `gld` displays the diff log. - `gld` displays the diff log.
- `glo` displays the one line log. - `glo` displays the one line log.
- `glO` displays the one line log with authors and dates.
- `glg` displays the graph log. - `glg` displays the graph log.
- `glG` displays the graph log with authors and dates. - `glG` displays the graph log with authors and dates.
- `glb` displays the brief commit log.
- `glc` displays the commit count for each contributor in descending order.
- `glv` displays the log verifying the GPG signature of commits. - `glv` displays the log verifying the GPG signature of commits.
- `glc` displays the commit count for each contributor in descending order.
### Merge ### Merge

9
modules/git/init.zsh
View file

@ -10,8 +10,7 @@
# See https://git-scm.com/docs/pretty-formats # See https://git-scm.com/docs/pretty-formats
_git_log_medium_format='%C(bold)Commit:%C(reset) %C(yellow)%H%C(auto)%d%n%C(bold)Author:%C(reset) %C(bold blue)%an <%ae>%n%C(bold)Date:%C(reset) %C(cyan)%ai (%ar)%C(reset)%n%+B' _git_log_medium_format='%C(bold)Commit:%C(reset) %C(yellow)%H%C(auto)%d%n%C(bold)Author:%C(reset) %C(bold blue)%an <%ae>%n%C(bold)Date:%C(reset) %C(cyan)%ai (%ar)%C(reset)%n%+B'
_git_log_oneline_format='%C(yellow)%h%C(reset) %s%C(auto)%d%C(reset)' _git_log_oneline_format='%C(yellow)%h%C(reset) %s%C(auto)%d%C(reset)'
_git_log_fullgraph_format='%C(yellow)%h%C(reset) %<|(60,trunc)%s %C(bold blue)<%an> %C(reset)%C(cyan)(%ar)%C(auto)%d%C(reset)%n' _git_log_oneline_medium_format='%C(yellow)%h%C(reset) %<|(60,trunc)%s %C(bold blue)<%an> %C(reset)%C(cyan)(%ar)%C(auto)%d%C(reset)'
_git_log_brief_format='%C(yellow)%h%C(reset) %s%n%C(bold blue)(%ar by %an)%C(auto)%d%C(reset)%n'
# #
# Aliases # Aliases
@ -97,11 +96,11 @@ alias gl='git log --topo-order --pretty=format:"${_git_log_medium_format}"'
alias gls='git log --topo-order --stat --pretty=format:"${_git_log_medium_format}"' alias gls='git log --topo-order --stat --pretty=format:"${_git_log_medium_format}"'
alias gld='git log --topo-order --stat --patch --full-diff --pretty=format:"${_git_log_medium_format}"' alias gld='git log --topo-order --stat --patch --full-diff --pretty=format:"${_git_log_medium_format}"'
alias glo='git log --topo-order --pretty=format:"${_git_log_oneline_format}"' alias glo='git log --topo-order --pretty=format:"${_git_log_oneline_format}"'
alias glO='git log --topo-order --pretty=format:"${_git_log_oneline_medium_format}"'
alias glg='git log --topo-order --all --graph --pretty=format:"${_git_log_oneline_format}%n"' alias glg='git log --topo-order --all --graph --pretty=format:"${_git_log_oneline_format}%n"'
alias glG='git log --topo-order --all --graph --pretty=format:"${_git_log_fullgraph_format}"' alias glG='git log --topo-order --all --graph --pretty=format:"${_git_log_oneline_medium_format}%n"'
alias glb='git log --topo-order --pretty=format:"${_git_log_brief_format}"'
alias glc='git shortlog --summary --numbered'
alias glv='git log --topo-order --show-signature --pretty=format:"${_git_log_medium_format}"' alias glv='git log --topo-order --show-signature --pretty=format:"${_git_log_medium_format}"'
alias glc='git shortlog --summary --numbered'
# Merge (m) # Merge (m)
alias gm='git merge' alias gm='git merge'