diff options
author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-07-31 13:56:46 +0100 |
---|---|---|
committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-07-31 14:21:48 +0100 |
commit | 99bfdd1686cd2870fce5a4d08d63b479fe4ef41f (patch) | |
tree | 1bd79646e6a090b77e06d08b4f10ec1dd8611d0d | |
parent | fcff4f4b403b6dd53d6bc6b10d56baccd83dd144 (diff) |
dgit-maint-debrebase(7): Warn more against plain git rebase.
Specifically,
- warn that pseudomerges must not be rebased over
- warn and that git-rebase without a base should not be used
- say to run gdr instead
Closes:#905004.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
-rw-r--r-- | debian/changelog | 2 | ||||
-rw-r--r-- | dgit-maint-debrebase.7.pod | 7 |
2 files changed, 8 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog index 2e1497d..4cc32d2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -13,6 +13,8 @@ dgit (6.3~) unstable; urgency=medium upstream discrepancy. Closes:#905078. * git-debrebase(5): Add ILLEGAL OPERATIONS section. (Re#905004.) * git-debrebase(1): Warn against plain git rebase. (Re#905004.) + * dgit-maint-debrebase(7): Warn more against plain git rebase. + Closes:#905004. -- diff --git a/dgit-maint-debrebase.7.pod b/dgit-maint-debrebase.7.pod index 685a6b2..0f2f892 100644 --- a/dgit-maint-debrebase.7.pod +++ b/dgit-maint-debrebase.7.pod @@ -625,7 +625,12 @@ using git-rebase(1) directly. For example, =back If you take this approach, you should be very careful not to start the -rebase too early. +rebase too early, +including before the most recent pseudomerge. +git-rebase without a base argument will often +start the rebase too early, +and should be avoided. +Run git-debrebase instead. =head1 SEE ALSO |