commit - 79878eb8ee8fb9380505ae4a7a252cf38dc273d2
commit + 1a70a2078b605112beede15564122b377eeba92d
blob - 96f5c68c5ec9bbaca2f9031c659305f430e14ec3
blob + 9a597f830f804c16127ff30090ba841c019b477c
--- got/got.1
+++ got/got.1
namespace.
This avoids the usual requirement of having to run
.Cm got rebase
+or
+.Cm got merge
after
.Cm got fetch
in order to make incoming changes appear on branches in the
reference namespace will be updated to point at the newly fetched commits.
The
.Cm got rebase
+or
+.Cm got merge
command can then be used to make new changes visible on branches in the
.Dq refs/heads/
namespace, merging incoming changes with the changes on those branches
Attempt to force the server to overwrite existing branches or tags
in the remote repository, even when
.Cm got fetch
-and
+followed by
.Cm got rebase
+or
+.Cm got merge
would usually be required before changes can be sent.
The server may reject forced requests regardless, depending on its
configuration.
be fetched with
.Cm got fetch
and local branches should be rebased with
-.Cm got rebase ,
+.Cm got rebase
+or merged with
+.Cm got merge ,
followed by another attempt to send the changes.
.Pp
The
The
.Cm got update ,
.Cm got rebase ,
+.Cm got merge ,
and
.Cm got histedit
commands will refuse to run while staged changes exist.
.Cm got commit ,
.Cm got import ,
.Cm got rebase ,
+.Cm got merge ,
and
.Cm got histedit
commands.