Update git aliases
This commit is contained in:
		
							parent
							
								
									606096c674
								
							
						
					
					
						commit
						67bd7e4454
					
				
							
								
								
									
										10
									
								
								.aliases
									
									
									
									
									
								
							
							
						
						
									
										10
									
								
								.aliases
									
									
									
									
									
								
							| 
						 | 
					@ -1166,6 +1166,11 @@ if [[ '${platform,,}' == *'ming'* ]]; then
 | 
				
			||||||
    alias git="PATH=/usr/bin git"
 | 
					    alias git="PATH=/usr/bin git"
 | 
				
			||||||
fi
 | 
					fi
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					# Performs a commit amend with the nocheckin prehook disabled.
 | 
				
			||||||
 | 
					git_amend_nocheckin() {
 | 
				
			||||||
 | 
					    eval "DISABLE_NOCHECKIN=1 git commit --amend"
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
git_cmd_wrapper() {
 | 
					git_cmd_wrapper() {
 | 
				
			||||||
    # If no args are provided then run `git status -s`
 | 
					    # If no args are provided then run `git status -s`
 | 
				
			||||||
    if [[ $# > 0 ]]; then
 | 
					    if [[ $# > 0 ]]; then
 | 
				
			||||||
| 
						 | 
					@ -1191,6 +1196,7 @@ git_commit_signed() {
 | 
				
			||||||
    eval "$cmd"
 | 
					    eval "$cmd"
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					# Performs a commit amend to the head with the nocheckin prehook disabled.
 | 
				
			||||||
git_fix_nocheckin() {
 | 
					git_fix_nocheckin() {
 | 
				
			||||||
    eval "DISABLE_NOCHECKIN=1 git commit --amend -C HEAD"
 | 
					    eval "DISABLE_NOCHECKIN=1 git commit --amend -C HEAD"
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
| 
						 | 
					@ -1212,10 +1218,9 @@ git_create_stash_patch() {
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
alias am='git commit --amend'
 | 
					alias am='git commit --amend'
 | 
				
			||||||
 | 
					alias amno='git_amend_nocheckin'
 | 
				
			||||||
alias ama='git commit --amend -C head --author'
 | 
					alias ama='git commit --amend -C head --author'
 | 
				
			||||||
alias ams='git commit -S --amend' # signed
 | 
					alias ams='git commit -S --amend' # signed
 | 
				
			||||||
alias ammend='echo "use am instead"'
 | 
					 | 
				
			||||||
alias amend='echo "use am instead"'
 | 
					 | 
				
			||||||
alias g='git_cmd_wrapper'
 | 
					alias g='git_cmd_wrapper'
 | 
				
			||||||
alias ga='git add -A'
 | 
					alias ga='git add -A'
 | 
				
			||||||
alias gaa='git add -A; gdcc'
 | 
					alias gaa='git add -A; gdcc'
 | 
				
			||||||
| 
						 | 
					@ -1321,6 +1326,7 @@ alias gsd='git stash drop'
 | 
				
			||||||
alias gsl='git stash list'
 | 
					alias gsl='git stash list'
 | 
				
			||||||
alias gsi='git stash -p'
 | 
					alias gsi='git stash -p'
 | 
				
			||||||
alias gsp='git stash pop'
 | 
					alias gsp='git stash pop'
 | 
				
			||||||
 | 
					alias gspm='git stash pop --merge'
 | 
				
			||||||
alias gsp0='git stash pop stash@{0}'
 | 
					alias gsp0='git stash pop stash@{0}'
 | 
				
			||||||
alias gsp1='git stash pop stash@{1}'
 | 
					alias gsp1='git stash pop stash@{1}'
 | 
				
			||||||
alias gsp2='git stash pop stash@{2}'
 | 
					alias gsp2='git stash pop stash@{2}'
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in New Issue
	
	Block a user