mirror of
				https://github.com/dcarrillo/prezto.git
				synced 2025-11-04 12:09:08 +00:00 
			
		
		
		
	Compare commits
	
		
			1 Commits
		
	
	
		
			pull/651-g
			...
			pull/607-t
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| 
						 | 
					9dd65d3982 | 
@@ -55,8 +55,6 @@ alias gcr='git revert'
 | 
			
		||||
alias gcR='git reset "HEAD^"'
 | 
			
		||||
alias gcs='git show'
 | 
			
		||||
alias gcl='git-commit-lost'
 | 
			
		||||
alias gcS='git commit -S'
 | 
			
		||||
alias gpS='git show --pretty=short --show-signature'
 | 
			
		||||
 | 
			
		||||
# Conflict (C)
 | 
			
		||||
alias gCl='git status | sed -n "s/^.*both [a-z]*ed: *//p"'
 | 
			
		||||
@@ -109,7 +107,6 @@ 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'
 | 
			
		||||
alias glS='git log --show-signature'
 | 
			
		||||
 | 
			
		||||
# Merge (m)
 | 
			
		||||
alias gm='git merge'
 | 
			
		||||
@@ -171,10 +168,6 @@ alias gSs='git submodule sync'
 | 
			
		||||
alias gSu='git submodule foreach git pull origin master'
 | 
			
		||||
alias gSx='git-submodule-remove'
 | 
			
		||||
 | 
			
		||||
# Tag (t)
 | 
			
		||||
alias gts='git tag -s'
 | 
			
		||||
alias gtv='git verify-tag'
 | 
			
		||||
 | 
			
		||||
# Working Copy (w)
 | 
			
		||||
alias gws='git status --ignore-submodules=${_git_status_ignore_submodules} --short'
 | 
			
		||||
alias gwS='git status --ignore-submodules=${_git_status_ignore_submodules}'
 | 
			
		||||
 
 | 
			
		||||
@@ -23,6 +23,10 @@ following line to *zpreztorc*:
 | 
			
		||||
In both cases, it will create a background session named _prezto_ if the tmux
 | 
			
		||||
server is not started.
 | 
			
		||||
 | 
			
		||||
You can change the default session name with:
 | 
			
		||||
 | 
			
		||||
    zstyle ':prezto:module:tmux' session 'YOUR DEFAULT SESSION NAME'
 | 
			
		||||
 | 
			
		||||
With `auto-start` enabled, you may want to control how multiple sessions are
 | 
			
		||||
managed. The `destroy-unattached` option of tmux controls if the unattached
 | 
			
		||||
sessions must be kept alive, making sessions available for later use, configured
 | 
			
		||||
 
 | 
			
		||||
@@ -25,10 +25,10 @@ if [[ -z "$TMUX" && -z "$EMACS" && -z "$VIM" ]] && ( \
 | 
			
		||||
 | 
			
		||||
  # Create a 'prezto' session if no session has been defined in tmux.conf.
 | 
			
		||||
  if ! tmux has-session 2> /dev/null; then
 | 
			
		||||
    tmux_session='prezto'
 | 
			
		||||
    zstyle -s ':prezto:module:tmux' session 'session' || session='prezto'
 | 
			
		||||
    tmux \
 | 
			
		||||
      new-session -d -s "$tmux_session" \; \
 | 
			
		||||
      set-option -t "$tmux_session" destroy-unattached off &> /dev/null
 | 
			
		||||
      new-session -d -s "$session" \; \
 | 
			
		||||
      set-option -t "$session" destroy-unattached off &> /dev/null
 | 
			
		||||
  fi
 | 
			
		||||
 | 
			
		||||
  # Attach to the 'prezto' session or to the last session used.
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user