feature: show commit lists in merge and rebase in a table
This commit is contained in:
@@ -71,15 +71,7 @@ def run_local(branch: str, target: str):
|
||||
|
||||
|
||||
def show_commits_to_merge(target):
|
||||
commits = Git("log", target + "..", format="%s").lines()
|
||||
|
||||
if not commits:
|
||||
raise GitFlowError("No hay cambios a mergear.")
|
||||
|
||||
print("Cambios a mergear:")
|
||||
|
||||
for commit in commits:
|
||||
print("- " + commit)
|
||||
base.show_commits("Cambios a mergear", target + "..")
|
||||
|
||||
|
||||
def check_merge_conflicts(target: str):
|
||||
|
||||
Reference in New Issue
Block a user