summaryrefslogtreecommitdiff
path: root/git-svn.perl
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-05-05 22:52:17 -0700
committerJunio C Hamano <gitster@pobox.com>2009-05-05 22:52:17 -0700
commit8146f19762c8fd67f6df3da4ba87a4e5ea880909 (patch)
tree4c870d39697d7155ef2d2e2c3c87afc76de77e6c /git-svn.perl
parentae616de6d53ef14ba11d2aa32f366086c1435dfa (diff)
parent54e0e6edfa60f84b582112804365e207e70f44a6 (diff)
downloadgit-8146f19762c8fd67f6df3da4ba87a4e5ea880909.tar.gz
Merge branch 'maint'
* maint: improve error message in config.c t4018-diff-funcname: add cpp xfuncname pattern to syntax test Work around BSD whose typeof(tv.tv_sec) != time_t git-am.txt: reword extra headers in message body git-am.txt: Use date or value instead of time or timestamp git-am.txt: add an 'a', say what 'it' is, simplify a sentence dir.c: Fix two minor grammatical errors in comments git-svn: fix a sloppy Getopt::Long usage
Diffstat (limited to 'git-svn.perl')
-rwxr-xr-xgit-svn.perl2
1 files changed, 1 insertions, 1 deletions
diff --git a/git-svn.perl b/git-svn.perl
index c5965c9aaf..ef1d30db38 100755
--- a/git-svn.perl
+++ b/git-svn.perl
@@ -147,7 +147,7 @@ my %cmd = (
'dry-run|n' => \$_dry_run } ],
'set-tree' => [ \&cmd_set_tree,
"Set an SVN repository to a git tree-ish",
- { 'stdin|' => \$_stdin, %cmt_opts, %fc_opts, } ],
+ { 'stdin' => \$_stdin, %cmt_opts, %fc_opts, } ],
'create-ignore' => [ \&cmd_create_ignore,
'Create a .gitignore per svn:ignore',
{ 'revision|r=i' => \$_revision