From 7faed22010cacb9bd7cc029b860840947e03bf8a Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sun, 18 Feb 2018 11:32:21 +0000 Subject: git-debrebase: Introduce term `anchor' And replace `breakwater merge' and `breakwater upstream merge' everywhere. Signed-off-by: Ian Jackson --- README.git-debrebase | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'README.git-debrebase') 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 -- cgit v1.2.3