1
0
mirror of https://github.com/dcarrillo/prezto.git synced 2025-07-01 20:59:26 +00:00

Compare commits

..

1 Commits

Author SHA1 Message Date
c3bd8a4708 Aliases to digital sign/verify commits and tags 2014-08-10 04:52:30 -03:00
3 changed files with 19 additions and 29 deletions

View File

@ -55,6 +55,8 @@ alias gcr='git revert'
alias gcR='git reset "HEAD^"' alias gcR='git reset "HEAD^"'
alias gcs='git show' alias gcs='git show'
alias gcl='git-commit-lost' alias gcl='git-commit-lost'
alias gcS='git commit -S'
alias gpS='git show --pretty=short --show-signature'
# Conflict (C) # Conflict (C)
alias gCl='git status | sed -n "s/^.*both [a-z]*ed: *//p"' alias gCl='git status | sed -n "s/^.*both [a-z]*ed: *//p"'
@ -107,6 +109,7 @@ 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 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 glb='git log --topo-order --pretty=format:${_git_log_brief_format}'
alias glc='git shortlog --summary --numbered' alias glc='git shortlog --summary --numbered'
alias glS='git log --show-signature'
# Merge (m) # Merge (m)
alias gm='git merge' alias gm='git merge'
@ -168,6 +171,10 @@ alias gSs='git submodule sync'
alias gSu='git submodule foreach git pull origin master' alias gSu='git submodule foreach git pull origin master'
alias gSx='git-submodule-remove' alias gSx='git-submodule-remove'
# Tag (t)
alias gts='git tag -s'
alias gtv='git verify-tag'
# Working Copy (w) # Working Copy (w)
alias gws='git status --ignore-submodules=${_git_status_ignore_submodules} --short' alias gws='git status --ignore-submodules=${_git_status_ignore_submodules} --short'
alias gwS='git status --ignore-submodules=${_git_status_ignore_submodules}' alias gwS='git status --ignore-submodules=${_git_status_ignore_submodules}'

View File

@ -20,25 +20,15 @@ following line to *zpreztorc*:
zstyle ':prezto:module:tmux:auto-start' remote 'yes' zstyle ':prezto:module:tmux:auto-start' remote 'yes'
In both cases the tmux server will be started and a background session In both cases, it will create a background session named _prezto_ if the tmux
named _prezto_ will be created if a session doesn't already exist. server is not started.
By default every shell shares a set of windows but has an independent With `auto-start` enabled, you may want to control how multiple sessions are
view. Detaching from one of these sessions removes the view but the managed. The `destroy-unattached` option of tmux controls if the unattached
open windows persist. This is accomplished by setting the sessions must be kept alive, making sessions available for later use, configured
`destroy-unattached` option to `on` for each session. in *tmux.conf*:
Some users prefer that all new shells share the same session so that
the view for each shell is in sync. This useful for advanced users
that create multiple sessions and want to manually navigate between
them. To accomplish this behavior set the `mode` option to `shared` in
*zpreztorc*,
zstyle ':prezto:module:tmux:auto-start' mode shared
You can customize the background session by creating a new session in
your `.tmux.conf` file.
set-option -g destroy-unattached [on | off]
Aliases Aliases
------- -------

View File

@ -25,21 +25,14 @@ if [[ -z "$TMUX" && -z "$EMACS" && -z "$VIM" ]] && ( \
# Create a 'prezto' session if no session has been defined in tmux.conf. # Create a 'prezto' session if no session has been defined in tmux.conf.
if ! tmux has-session 2> /dev/null; then if ! tmux has-session 2> /dev/null; then
tmux_session='prezto'
tmux \ tmux \
new-session -d -s prezto \; \ new-session -d -s "$tmux_session" \; \
set-option -t prezto destroy-unattached off &> /dev/null set-option -t "$tmux_session" destroy-unattached off &> /dev/null
else
tmux_session
fi fi
if zstyle -t ':prezto:module:tmux:auto-start' mode shared; then # Attach to the 'prezto' session or to the last session used.
# Attach to the 'prezto' session or to the last session used. exec tmux attach-session
exec tmux attach
else
# Find a session to share windows with.
tmux_session=`tmux list-sessions -F '#S' | head -n 1`
exec tmux new-session -t "$tmux_session"\; set-option destroy-unattached on
fi
fi fi
# #