diff options
| author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-02-18 11:32:21 +0000 |
|---|---|---|
| committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-06-16 16:06:58 +0100 |
| commit | 7faed22010cacb9bd7cc029b860840947e03bf8a (patch) | |
| tree | ce6da313692a8b4cbc3718976fa477ff2cf2193c /README.git-debrebase | |
| parent | 4f22209a590da904276c3a52643473f44cc22d18 (diff) | |
git-debrebase: Introduce term `anchor'
And replace `breakwater merge' and `breakwater upstream merge'
everywhere.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Diffstat (limited to 'README.git-debrebase')
| -rw-r--r-- | README.git-debrebase | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/README.git-debrebase b/README.git-debrebase index 9efdc1a..48ddd54 100644 --- a/README.git-debrebase +++ b/README.git-debrebase @@ -24,7 +24,7 @@ with a series of pseudomerges to make it fast-forwarding. B3 mixed commit (eg made by an NMUer) # upstream releases - -p- special merge, takes contents of debian/ from the + -p- anchor merge, takes contents of debian/ from the / previous `breakwater' commit and rest from upstream -/- pseudomerge; contents are identical to |