diff options
author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-02-18 22:46:58 +0000 |
---|---|---|
committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-06-16 16:06:59 +0100 |
commit | b822b6c13035de35290d03c497fdbd72560e3d34 (patch) | |
tree | e9ef0965444be132fc6d85b2a8c540dcb2ec7d7d /git-debrebase | |
parent | 4d17885419daca2127f870a06503ec5643d0f626 (diff) |
git-debrebase(5): Document commit message annotations
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Diffstat (limited to 'git-debrebase')
-rwxr-xr-x | git-debrebase | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/git-debrebase b/git-debrebase index cdd6348..5b2312d 100755 --- a/git-debrebase +++ b/git-debrebase @@ -438,6 +438,23 @@ sub classify ($) { # multi-orig upstreams are represented with an anchor merge # from a single upstream commit which combines the orig tarballs + # Every anchor tagged this way must be a merge. + # We are relying on the + # [git-debrebase anchor: ...] + # commit message annotation in "declare" anchor merges (which + # do not have any upstream changes), to distinguish those + # anchor merges from ordinary pseudomerges (which we might + # just try to strip). + # + # However, the user is going to be doing git-rebase a lot. We + # really don't want them to rewrite an anchor commit. + # git-rebase trips up on merges, so that is a useful safety + # catch. + # + # BreakwaterStart commits are also anchors in the terminology + # of git-debrebase(5), but they are untagged (and always + # manually generated). + my $badanchor = sub { $unknown->("git-debrebase \`anchor' but @_"); }; @p == 2 or return $badanchor->("has other than two parents"); $haspatches and return $badanchor->("contains debian/patches"); |