|
|
|
@ -10,6 +10,14 @@
|
|
|
|
|
#
|
|
|
|
|
#
|
|
|
|
|
|
|
|
|
|
# Log
|
|
|
|
|
zstyle -s ':prezto:module:git:log:medium' format '_git_log_medium_format' \
|
|
|
|
|
|| _git_log_medium_format='%C(bold)Commit:%C(reset) %C(green)%H%C(red)%d%n%C(bold)Author:%C(reset) %C(cyan)%an <%ae>%n%C(bold)Date:%C(reset) %C(blue)%ai (%ar)%C(reset)%n%+B'
|
|
|
|
|
zstyle -s ':prezto:module:git:log:oneline' format '_git_log_oneline_format' \
|
|
|
|
|
|| _git_log_oneline_format='%C(green)%h%C(reset) %s%C(red)%d%C(reset)%n'
|
|
|
|
|
zstyle -s ':prezto:module:git:log:brief' format '_git_log_brief_format' \
|
|
|
|
|
|| _git_log_brief_format='%C(green)%h%C(reset) %s%n%C(blue)(%ar by %an)%C(red)%d%C(reset)%n'
|
|
|
|
|
|
|
|
|
|
# Status
|
|
|
|
|
zstyle -s ':prezto:module:git:status:ignore' submodules '_git_status_ignore_submodules' \
|
|
|
|
|
|| _git_status_ignore_submodules='none'
|
|
|
|
@ -91,16 +99,12 @@ alias gCt='git checkout --theirs --'
|
|
|
|
|
alias gCT='gCt $(gCl)'
|
|
|
|
|
|
|
|
|
|
# Log (l)
|
|
|
|
|
git_log_format_medium='--pretty=format:%C(bold)Commit:%C(reset) %C(green)%H%C(red)%d%n%C(bold)Author:%C(reset) %C(cyan)%an <%ae>%n%C(bold)Date:%C(reset) %C(blue)%ai (%ar)%C(reset)%n%+B'
|
|
|
|
|
git_log_format_oneline='--pretty=format:%C(green)%h%C(reset) %s%C(red)%d%C(reset)%n'
|
|
|
|
|
git_log_format_brief='--pretty=format:%C(green)%h%C(reset) %s%n%C(blue)(%ar by %an)%C(red)%d%C(reset)%n'
|
|
|
|
|
|
|
|
|
|
alias gl='git log --topo-order ${git_log_format_medium}'
|
|
|
|
|
alias gls='git log --topo-order --stat ${git_log_format_medium}'
|
|
|
|
|
alias gld='git log --topo-order --stat --patch --full-diff ${git_log_format_medium}'
|
|
|
|
|
alias glo='git log --topo-order ${git_log_format_oneline}'
|
|
|
|
|
alias glg='git log --topo-order --all --graph ${git_log_format_oneline}'
|
|
|
|
|
alias glb='git log --topo-order ${git_log_format_brief}'
|
|
|
|
|
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 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 glg='git log --topo-order --all --graph --pretty=format:${_git_log_oneline_format}'
|
|
|
|
|
alias glb='git log --topo-order --pretty=format:${_git_log_brief_format}'
|
|
|
|
|
alias glc='git shortlog --summary --numbered'
|
|
|
|
|
|
|
|
|
|
# Merge (m)
|
|
|
|
|