mirror of
				https://github.com/dcarrillo/prezto.git
				synced 2025-11-04 12:09:08 +00:00 
			
		
		
		
	Compare commits
	
		
			1 Commits
		
	
	
		
			pull/636-v
			...
			pull/651-g
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| 
						 | 
					c3bd8a4708 | 
							
								
								
									
										3
									
								
								.gitmodules
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										3
									
								
								.gitmodules
									
									
									
									
										vendored
									
									
								
							@@ -7,6 +7,3 @@
 | 
				
			|||||||
[submodule "modules/completion/external"]
 | 
					[submodule "modules/completion/external"]
 | 
				
			||||||
	path = modules/completion/external
 | 
						path = modules/completion/external
 | 
				
			||||||
	url = https://github.com/zsh-users/zsh-completions.git
 | 
						url = https://github.com/zsh-users/zsh-completions.git
 | 
				
			||||||
[submodule "modules/opp/external"]
 | 
					 | 
				
			||||||
	path = modules/opp/external
 | 
					 | 
				
			||||||
	url = https://github.com/hchbaw/opp.zsh.git
 | 
					 | 
				
			||||||
 
 | 
				
			|||||||
@@ -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}'
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -1,19 +0,0 @@
 | 
				
			|||||||
VIM text objects
 | 
					 | 
				
			||||||
========================
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
Integrates [opp][1] into Prezto, which implements [vim text objects][2] right into vim mode of prezto.
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
Due to some conflicts with prezto loading, opp will get compiled during initial run.
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
Authors
 | 
					 | 
				
			||||||
-------
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
*The authors of this module should be contacted via the [issue tracker][3].*
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
  - [Takeshi Banse](https://github.com/hchbaw)
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
[1]: https://github.com/hchbaw/opp.zsh
 | 
					 | 
				
			||||||
[2]: http://blog.carbonfive.com/2011/10/17/vim-text-objects-the-definitive-guide/
 | 
					 | 
				
			||||||
[3]: https://github.com/hchbaw/opp.zsh/issues?state=open
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
@@ -1,20 +0,0 @@
 | 
				
			|||||||
# Vim's text-objects-ish for zsh.
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
# Author: Takeshi Banse <takebi@laafc.net>
 | 
					 | 
				
			||||||
# License: Public Domain
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
# Thank you very much, Bram Moolenaar!
 | 
					 | 
				
			||||||
# I want to use the Vim's text-objects in zsh.
 | 
					 | 
				
			||||||
if [[ ! -f ${0:h}/functions/opp.zwc ]] ||
 | 
					 | 
				
			||||||
   [[ ! -f ${0:h}/functions/opp-install.zwc ]]; then
 | 
					 | 
				
			||||||
  (
 | 
					 | 
				
			||||||
    . "${0:h}/external/opp.zsh"
 | 
					 | 
				
			||||||
    . "${0:h}/external/opp/surround.zsh"
 | 
					 | 
				
			||||||
    . "${0:h}/external/opp/textobj-between.zsh"
 | 
					 | 
				
			||||||
    opp-zcompile "${0:h}/external/opp.zsh" ${0:h}/functions > /dev/null
 | 
					 | 
				
			||||||
  )
 | 
					 | 
				
			||||||
  fpath+=${0:h}/functions > /dev/null
 | 
					 | 
				
			||||||
  . ${0:h}/functions/opp-install
 | 
					 | 
				
			||||||
  autoload opp
 | 
					 | 
				
			||||||
fi
 | 
					 | 
				
			||||||
opp-install
 | 
					 | 
				
			||||||
		Reference in New Issue
	
	Block a user