diff options
| author | Sean Whitton <spwhitton@spwhitton.name> | 2020-02-20 22:24:07 -0700 |
|---|---|---|
| committer | Sean Whitton <spwhitton@spwhitton.name> | 2020-02-20 22:24:07 -0700 |
| commit | b16d55213da9f96d71d50bfa78db3ccc561f46fd (patch) | |
| tree | 4f960f4526d2c36560c806c23699a2f9cef5fcbb /git-debrebase.1.pod | |
| parent | b7fe58b0f4793dbd1eb9920e7233825c22b2928c (diff) | |
| parent | 4f41d991f1343912b5bd704be1e1cbb1ace52dba (diff) | |
Merge tag 'debian/9.10' into buster-bpo
dgit release 9.10 for unstable (sid) [dgit]
[dgit distro=debian no-split]
# gpg: Signature made Mon 03 Feb 2020 01:48:30 AM MST
# gpg: using RSA key 559AE46C2D6B6D3265E7CBA1E3E3392348B50D39
# gpg: Can't check signature: No public key
Diffstat (limited to 'git-debrebase.1.pod')
| -rw-r--r-- | git-debrebase.1.pod | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/git-debrebase.1.pod b/git-debrebase.1.pod index d1b4507..bc1fdd6 100644 --- a/git-debrebase.1.pod +++ b/git-debrebase.1.pod @@ -129,7 +129,8 @@ You should consider using B<prepush> or B<conclude> instead. =item git-debrebase scrap Throws away all the work since the branch was last stitched. -This is done by rewinding you to ffq-prev. +This is done by resetting you to ffq-prev +and discarding all working tree changes. If you are in the middle of a git-rebase, will abort that too. |