aboutsummaryrefslogtreecommitdiff
path: root/git-svn.perl
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2008-10-26 16:21:08 -0700
committerJunio C Hamano <gitster@pobox.com>2008-10-26 16:21:08 -0700
commit304d058370a9a797c38ec739c6d39fa45d9ed8e5 (patch)
tree36488ea65db3ef57e6be9cb87c89283362fbc878 /git-svn.perl
parentb8492539f9c078162ee3ae4987ceaa7e7f510c9b (diff)
parent9fe7a643fcc56ca1c17afec5d5f8adca10cabdd1 (diff)
downloadgit-304d058370a9a797c38ec739c6d39fa45d9ed8e5.tar.gz
git-304d058370a9a797c38ec739c6d39fa45d9ed8e5.tar.xz
Merge branch 'maint'
* maint: add -p: warn if only binary changes present git-archive: work in bare repos git-svn: change dashed git-config to git config
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 ef6d773df..f90ddac90 100755
--- a/git-svn.perl
+++ b/git-svn.perl
@@ -1191,7 +1191,7 @@ sub read_repo_config {
my $v = $opts->{$o};
my ($key) = ($o =~ /^([a-zA-Z\-]+)/);
$key =~ s/-//g;
- my $arg = 'git-config';
+ my $arg = 'git config';
$arg .= ' --int' if ($o =~ /[:=]i$/);
$arg .= ' --bool' if ($o !~ /[:=][sfi]$/);
if (ref $v eq 'ARRAY') {