git-rebase: fix typo when parsing --force-rebase
Due to two missing hyphens, The "force" keyword on the command line would be taken as an alias for the --force-rebase option. Signed-off-by: Willy Tarreau <w@1wt.eu> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
		
				
					committed by
					
						
						Junio C Hamano
					
				
			
			
				
	
			
			
			
						parent
						
							1702b1381e
						
					
				
				
					commit
					1bc6bf6dea
				
			@ -346,7 +346,7 @@ do
 | 
			
		||||
	--root)
 | 
			
		||||
		rebase_root=t
 | 
			
		||||
		;;
 | 
			
		||||
	-f|--f|--fo|--for|--forc|force|--force-r|--force-re|--force-reb|--force-reba|--force-rebas|--force-rebase|--no-ff)
 | 
			
		||||
	-f|--f|--fo|--for|--forc|--force|--force-r|--force-re|--force-reb|--force-reba|--force-rebas|--force-rebase|--no-ff)
 | 
			
		||||
		force_rebase=t
 | 
			
		||||
		;;
 | 
			
		||||
	--rerere-autoupdate|--no-rerere-autoupdate)
 | 
			
		||||
 | 
			
		||||
		Reference in New Issue
	
	Block a user