File tree Expand file tree Collapse file tree 2 files changed +5
-2
lines changed
Expand file tree Collapse file tree 2 files changed +5
-2
lines changed Original file line number Diff line number Diff line change @@ -942,7 +942,10 @@ pub enum TestSubcommand {
942942 verbosity : u8 ,
943943 } ,
944944
945- /// Run a given command on a set of commits and present the successes and failures.
945+ /// Rewrites a set of commits one by one, by running a given command on each commit
946+ ///
947+ /// The descendants are "reparented" onto the rewritten commits without changing their
948+ /// contents. This avoids the possibility of merge conflicts in descendants.
946949 Fix {
947950 /// An ad-hoc command to execute on each commit.
948951 #[ clap( value_parser, short = 'x' , long = "exec" ) ]
Original file line number Diff line number Diff line change @@ -388,7 +388,7 @@ BUG: Expected resolved_interactive ({resolved_interactive:?}) to match interacti
388388 resolve_merge_conflicts,
389389 dump_rebase_constraints,
390390 dump_rebase_plan,
391- reparent : _, // not yet implemented
391+ reparent : _, // always implied
392392 } = move_options;
393393
394394 let force_in_memory = true ;
You can’t perform that action at this time.
0 commit comments