(
branch: str = typer.Argument(
...,
help="The name of the branch to merge into the active checked-out branch",
),
no_ff: bool = typer.Option(
False,
"--no-ff",
help="Simulate creation of a merge commit in all cases, even when the merge could instead be resolved as a fast-forward",
),
message: str = typer.Option(
"Merge commit",
"--message",
"-m",
help="The commit message of the new merge commit",
),
)
| 182 | |
| 183 | |
| 184 | def merge( |
| 185 | branch: str = typer.Argument( |
| 186 | ..., |
| 187 | help="The name of the branch to merge into the active checked-out branch", |
| 188 | ), |
| 189 | no_ff: bool = typer.Option( |
| 190 | False, |
| 191 | "--no-ff", |
| 192 | help="Simulate creation of a merge commit in all cases, even when the merge could instead be resolved as a fast-forward", |
| 193 | ), |
| 194 | message: str = typer.Option( |
| 195 | "Merge commit", |
| 196 | "--message", |
| 197 | "-m", |
| 198 | help="The commit message of the new merge commit", |
| 199 | ), |
| 200 | ): |
| 201 | from git_sim.merge import Merge |
| 202 | |
| 203 | scene = Merge(branch=branch, no_ff=no_ff, message=message) |
| 204 | handle_animations(scene=scene) |
| 205 | |
| 206 | |
| 207 | def mv( |
nothing calls this directly
no test coverage detected