chiark
/
gitweb
/
~ianmdlvl
/
dgit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
git-debrebase: Introduce term `anchor'
[dgit.git]
/
README.git-debrebase
diff --git
a/README.git-debrebase
b/README.git-debrebase
index 9efdc1aca4056a60a50ae7bfd7d8ba455f18910b..48ddd549a2b861bcc544700cc6136a61aecd60cd 100644
(file)
--- 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
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
/ previous `breakwater' commit and rest from upstream
-/- pseudomerge; contents are identical to