Skip to contentSkip to conversation

minor typo fix for git-rebase

PATCH In review Willy Tarreau 2 participants 2 messages Jun 15, 2016

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 minor typo fix for git-rebase

Hi !

I found the minor typo below while reading the script.

Cheers,
Willy

--------
From 54fbcaabbd2c9d6da1b51a35114838797585cb06 Mon Sep 17 00:00:00 2001
From: Willy Tarreau <[email protected]>
Date: Sun, 8 Aug 2010 07:13:32 +0200
Subject: 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.

---
 git-rebase.sh |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
git-rebase.sh +1 -1
index 2d88742..1d38afd 100755
@@ -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)
Signature · 1 line
1.6.4.4
#1 lore raw

git-rebase.sh do · line 349

Quoted 2 lines · Willy Tarreau
git-rebase.sh +1 -1
-	-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)

Nice catch! Thanks.