Rename 'git river restart' to 'git river rebase'

datto · Apr 27, 2022 · 4093b69 · 4093b69
1 parent 4da8d95
commit 4093b69
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/.gitignore b/.gitignore
@@ -2,3 +2,4 @@
 .idea/
 __pycache__/
 config.json
+dist/
diff --git a/git_river/cli.py b/git_river/cli.py
@@ -44,5 +44,5 @@ def main(ctx: click.Context) -> None:
 main.add_command(git_river.commands.repo.fetch_remotes)
 main.add_command(git_river.commands.repo.merge_feature_branches)
 main.add_command(git_river.commands.repo.tidy_branches)
-main.add_command(git_river.commands.repo.restart)
+main.add_command(git_river.commands.repo.rebase)
 main.add_command(git_river.commands.repo.end)
diff --git a/git_river/commands/repo.py b/git_river/commands/repo.py
@@ -145,11 +145,11 @@ def tidy_branches(path: pathlib.Path, dry_run: bool, mainline: typing.Optional[s
     repo.remove_merged_branches(mainline, dry_run=dry_run)
 
 
-@click.command(name="restart")
+@click.command(name="rebase")
 @click_repo_option
 @click_upstream_remote_option
 @click_mainline_option
-def restart(
+def rebase(
     path: pathlib.Path,
     upstream: typing.Optional[str],
     mainline: typing.Optional[str],
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,3 +2,4 @@ @@
     .idea/
     __pycache__/
     config.json
+    dist/