* [PATCH] minor typo fix for git-rebase
@ 2010-08-08 5:30 Willy Tarreau
2010-08-08 22:08 ` Jonathan Nieder
0 siblings, 1 reply; 2+ messages in thread
From: Willy Tarreau @ 2010-08-08 5:30 UTC (permalink / raw)
To: git
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 <w@1wt.eu>
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.
Signed-off-by: Willy Tarreau <w@1wt.eu>
---
git-rebase.sh | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/git-rebase.sh b/git-rebase.sh
index 2d88742..1d38afd 100755
--- a/git-rebase.sh
+++ b/git-rebase.sh
@@ -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)
--
1.6.4.4
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] minor typo fix for git-rebase
2010-08-08 5:30 [PATCH] minor typo fix for git-rebase Willy Tarreau
@ 2010-08-08 22:08 ` Jonathan Nieder
0 siblings, 0 replies; 2+ messages in thread
From: Jonathan Nieder @ 2010-08-08 22:08 UTC (permalink / raw)
To: Willy Tarreau; +Cc: git, Marc Branchaud, Junio C Hamano
Willy Tarreau wrote:
> - -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.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2010-08-08 22:10 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-08-08 5:30 [PATCH] minor typo fix for git-rebase Willy Tarreau
2010-08-08 22:08 ` Jonathan Nieder
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).