diff --git a/cmd/flags_man_pages.go b/cmd/flags_man_pages.go index ef91ff9..6a062c6 100644 --- a/cmd/flags_man_pages.go +++ b/cmd/flags_man_pages.go @@ -1495,8 +1495,7 @@ Transmit the given string to the server, which passes them to the pre-receive as Path to the git-receive-pack program on the remote end. Sometimes useful when pushing to a remote repository over ssh, and you do not have the program in a directory on the default $PATH. --[no-]force-with-lease ---force-with-lease= ---force-with-lease=: +--force-with-lease Usually, "git push" refuses to update a remote ref that is not an ancestor of the local ref used to overwrite it. This option overrides this restriction if the current value of the remote ref is the expected value. "git push" fails otherwise. diff --git a/cmd/git.go b/cmd/git.go index 460e2b7..c739e8e 100644 --- a/cmd/git.go +++ b/cmd/git.go @@ -95,10 +95,10 @@ func refreshBranch() error { if err != nil { return err } - if strings.TrimSpace(string(msg)) == "Already up to date." { + if strings.Contains(strings.TrimSpace(string(msg)), "up to date") { return nil } - log.Debug().Msg("Branch was fast-forwarded") + fmt.Println("Branch was fast-forwarded") return nil }