commit c10890ce3c1950af61bcb45f7552f1d9ec14d08b from: Stefan Sperling date: Tue Feb 25 13:32:18 2020 UTC in got.1, clarify that rebasing of branches with zero local changes is normal commit - 5dd154fcf3014e47ec23d51776f448cb241ec873 commit + c10890ce3c1950af61bcb45f7552f1d9ec14d08b blob - 62c5d240f167f230a11d8eeaa5d9300c14c62abb blob + 05a4896a63a16b4b11b02defcba785a8a2b95b14 --- got/got.1 +++ got/got.1 @@ -940,8 +940,8 @@ When .Cm got rebase is used as intended, the specified .Ar branch -contains changes made in local commits that are not yet visible in any -other repositories. +represents a local commit history and may already contain changes +that are not yet visible in any other repositories. The work tree's current branch, which must be set with .Cm got update -b before starting the @@ -949,7 +949,8 @@ before starting the operation, represents a branch from a remote repository which shares a common history with the specified .Ar branch -but has at some point diverged due to commits added to the remote repository. +but has progressed, and perhaps diverged, due to commits added to the +remote repository. .Pp Rebased commits are accumulated on a temporary branch which the work tree will remain switched to throughout the entire rebase operation.