View | Details | Raw Unified | Return to bug 38664
Collapse All | Expand All

(-)a/misc/devel/auto_rebase.pl (-2 / +6 lines)
Lines 167-173 FILE: while ( my ( $ii, $file ) = each @modified_files ) { Link Here
167
        write_file( $file, join "\n", @content );
167
        write_file( $file, join "\n", @content );
168
168
169
        # Tidy the file
169
        # Tidy the file
170
        my $cmd = "$conflict_resolver_script $file";
170
        my $cmd = "perl $conflict_resolver_script $file";
171
        try {
171
        try {
172
            system $cmd;
172
            system $cmd;
173
        } catch {
173
        } catch {
Lines 240-245 The source branch is the branch that is currently checked out. Link Here
240
240
241
=head1 EXAMPLES
241
=head1 EXAMPLES
242
242
243
First you need to retrieve this script from the main branch, do not place it under misc/devel/auto_rebase.pl or you will get an error (`The following untracked working tree files would be overwritten by checkout`).
244
245
  git show origin/main:misc/devel/auto_rebase.pl > auto_rebase.pl
246
  chmod +x auto_rebase.pl
247
243
Rebase onto 'main' in the current repository:
248
Rebase onto 'main' in the current repository:
244
249
245
  ./auto_rebase.pl
250
  ./auto_rebase.pl
246
- 

Return to bug 38664