helper file for me to stay up-to-date with master
This commit is contained in:
		
							parent
							
								
									de96513ff2
								
							
						
					
					
						commit
						db7aa91e76
					
				
					 1 changed files with 4 additions and 0 deletions
				
			
		
							
								
								
									
										4
									
								
								keyboards/satan/keymaps/iso_split_rshift/updatemerge.sh
									
										
									
									
									
										Executable file
									
								
							
							
						
						
									
										4
									
								
								keyboards/satan/keymaps/iso_split_rshift/updatemerge.sh
									
										
									
									
									
										Executable file
									
								
							| 
						 | 
				
			
			@ -0,0 +1,4 @@
 | 
			
		|||
#!/bin/bash
 | 
			
		||||
git checkout iso_split_rshift # gets you "on branch dmgr2"
 | 
			
		||||
git fetch origin              # gets you up to date with origin
 | 
			
		||||
git merge origin/master
 | 
			
		||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue