diff options
| author | Eric Wong <normalperson@yhbt.net> | 2007-03-13 11:40:36 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-03-13 21:18:37 -0700 |
| commit | dee41f3e5569f9465018535f02d45796d84aebd8 (patch) | |
| tree | f3d009be86e46feee680f8c91d4c5bc29478c4c5 /git-svn.perl | |
| parent | 27ebd6e0443bdd795869f598ecebc9eadd64a26c (diff) | |
| download | git-dee41f3e5569f9465018535f02d45796d84aebd8.tar.gz git-dee41f3e5569f9465018535f02d45796d84aebd8.tar.xz | |
git-svn: add -l/--local command to "git svn rebase"
This avoids fetching new revisions remotely, and is usefuly
versus plain "git rebase" because the user does not have to
specify which remote head to rebase against.
Signed-off-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'git-svn.perl')
| -rwxr-xr-x | git-svn.perl | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/git-svn.perl b/git-svn.perl index 326e89fe0..e8457893d 100755 --- a/git-svn.perl +++ b/git-svn.perl @@ -56,7 +56,7 @@ my ($_stdin, $_help, $_edit, $_message, $_file, $_template, $_shared, $_version, $_fetch_all, - $_merge, $_strategy, $_dry_run, + $_merge, $_strategy, $_dry_run, $_local, $_prefix, $_no_checkout, $_verbose); $Git::SVN::_follow_parent = 1; my %remote_opts = ( 'username=s' => \$Git::SVN::Prompt::_username, @@ -145,6 +145,7 @@ my %cmd = ( { 'merge|m|M' => \$_merge, 'verbose|v' => \$_verbose, 'strategy|s=s' => \$_strategy, + 'local|l' => \$_local, 'fetch-all|all' => \$_fetch_all, %fc_opts } ], 'commit-diff' => [ \&cmd_commit_diff, @@ -439,7 +440,9 @@ sub cmd_rebase { command_noisy('status'); exit 1; } - $_fetch_all ? $gs->fetch_all : $gs->fetch; + unless ($_local) { + $_fetch_all ? $gs->fetch_all : $gs->fetch; + } command_noisy(rebase_cmd(), $gs->refname); } |