Provide new --collab-non-dgit option

Closes: #1050713
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

1 files changed, 25 insertions, 0 deletions

diff --git a/dgit.1 b/dgit.1
index ba886a6..e109f84 100644
--- a/dgit.1
+++ b/dgit.1
@@ -707,6 +707,31 @@ combination can fail if the untracked files are under
 .BR --ignore-dirty
 Deprecated alias for --include-dirty.
 .TP
+.BR --collab-non-dgit
+Make
+.BR "dgit push" ,
+behave more suitably for collaborating
+(using shared git history)
+with git-using co-developers who aren't using dgit.
+
+With this option,
+dgit won't mind that the git history you're using
+isn't necessarily fast forward from the dgit view;
+instead, it will rely on the changelog
+to prevent accidentally overwriting changes.
+
+And, the
+synthetic commits needed to
+make the dgit git history fast forward
+will appear only on the dgit git server,
+and local dgit suite branches,
+not on your own main branch.
+So they won't end up in the maintainer-visible history,
+when you push your own branch to make a merge request.
+
+This is equivalent to
+.BR "--split-view=always --trust-changelog" .
+.TP
 .BR --trust-changelog " | " --overwrite =\fIprevious-version\fR
 Declare that your HEAD really does contain
 all the (wanted) changes