diff options
author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2024-04-11 22:58:10 +0100 |
---|---|---|
committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2024-04-12 00:36:15 +0100 |
commit | cdb2b4b020fd24d4e88796ff54f4cb3c0aba57c0 (patch) | |
tree | f0f6a0dd89cce8bb8d9821b9038c421267d60510 | |
parent | ee1bbefb88e782ab9ee8d530db72790957b32e03 (diff) |
Provide new --collab-non-dgit option
Closes: #1050713
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
-rwxr-xr-x | dgit | 4 | ||||
-rw-r--r-- | dgit.1 | 25 |
2 files changed, 29 insertions, 0 deletions
@@ -8070,6 +8070,10 @@ sub parseopts () { } elsif (m/^--no-chase-dsc-distro$/s) { push @ropts, $_; $chase_dsc_distro = 0; + } elsif (m/^--collab-non-dgit$/s) { + push @ropts, $_; + $overwrite_version = ''; + $splitview_mode = 'always'; } elsif (m/^(?:--trust-changelog|--overwrite)$/s) { push @ropts, '--overwrite'; # TODO, eventually, change this $overwrite_version = ''; @@ -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 |