diff options
| author | Sean Whitton <spwhitton@spwhitton.name> | 2018-08-09 09:41:39 +0100 |
|---|---|---|
| committer | Sean Whitton <spwhitton@spwhitton.name> | 2018-08-09 09:41:39 +0100 |
| commit | 49f82e7fe2131175d7c411b1016e42dcb435351d (patch) | |
| tree | 581c57c05be4b782101c91008c73de0228410e4b /dgit-maint-debrebase.7.pod | |
| parent | 113bc577ce8a54f929a3790aedbce81ec320f0c0 (diff) | |
| parent | 66d19f834577d2495c8255f042aff4d86d040049 (diff) | |
Merge tag 'debian/6.6' into stretch-bpo
dgit release 6.6 for unstable (sid) [dgit]
[dgit distro=debian]
# gpg: Signature made Sun 05 Aug 2018 10:43:37 BST
# gpg: using RSA key 559AE46C2D6B6D3265E7CBA1E3E3392348B50D39
# gpg: Can't check signature: No public key
Diffstat (limited to 'dgit-maint-debrebase.7.pod')
| -rw-r--r-- | dgit-maint-debrebase.7.pod | 7 |
1 files changed, 6 insertions, 1 deletions
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 |