diff options
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 |