mirror of
				https://github.com/dcarrillo/prezto.git
				synced 2025-11-04 12:09:08 +00:00 
			
		
		
		
	Compare commits
	
		
			1 Commits
		
	
	
		
			pull/598-s
			...
			pull/651-g
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| 
						 | 
					c3bd8a4708 | 
@@ -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}'
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user