mirror of
				https://github.com/tiyn/dotfiles.git
				synced 2025-10-31 20:41:16 +01:00 
			
		
		
		
	
		
			
				
	
	
		
			16 lines
		
	
	
		
			429 B
		
	
	
	
		
			Bash
		
	
	
		
			Executable File
		
	
	
	
	
			
		
		
	
	
			16 lines
		
	
	
		
			429 B
		
	
	
	
		
			Bash
		
	
	
		
			Executable File
		
	
	
	
	
| #!/bin/zsh
 | |
| 
 | |
| # for merging all branches into the master branch of a git directory according to my suckless patch structure
 | |
| # e.g. see dwm/st/etc
 | |
| 
 | |
| suckdiff &&
 | |
| git reset --hard origin/base &&
 | |
| for branch in $(git for-each-ref --format='%(refname)' refs/heads/ | cut -d'/' -f3); do
 | |
| 	if [[ ("$branch" != "master") && ("$branch" != "base") ]];then
 | |
| 		echo $branch
 | |
| 		git merge $branch -m $branch
 | |
| 	fi
 | |
| done
 | |
| make && sudo make clean install
 | |
| 
 |