Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | git-debrebase: NOTES updates | Ian Jackson | 2018-06-16 |
| | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> | ||
* | git-debrebase: move some todo/notes to NOTES | Ian Jackson | 2018-06-16 |
| | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> | ||
* | git-debrebase(1): document record-ffq-prev | Ian Jackson | 2018-06-16 |
| | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> | ||
* | git-debrebase(1): wip | Ian Jackson | 2018-06-16 |
| | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> | ||
* | git-debrebase(1): wip | Ian Jackson | 2018-06-16 |
| | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> | ||
* | git-debrebase(5): finished now I think | Ian Jackson | 2018-06-16 |
| | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> | ||
* | git-debrebase(5): Document commit message annotations | Ian Jackson | 2018-06-16 |
| | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> | ||
* | git-debrebase: NOTES: tidying up | Ian Jackson | 2018-06-16 |
| | |||
* | git-debrebase: NOTES: record gbp import work done | Ian Jackson | 2018-06-16 |
| | |||
* | git-debrebase: NOTES: reword, record decisions about pm and ffq, tidy | Ian Jackson | 2018-06-16 |
| | |||
* | git-debrebase: NOTES: reword to record decisions about pm and ffq handling | Ian Jackson | 2018-06-16 |
| | |||
* | git-debrebase: test suite: test --anchor option | Ian Jackson | 2018-06-16 |
| | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> | ||
* | git-debrebase: test suite: gdr-newupstream-v0: new test | Ian Jackson | 2018-06-16 |
| | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> | ||
* | git-debrebase: NOTES: a todo | Ian Jackson | 2018-06-16 |
| | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> | ||
* | git-debrebase: Rename `launder' to `launder-v0' | Ian Jackson | 2018-06-16 |
| | | | | | | | This command is too raw, really, and we may want that name for something else (eg, rebase and stitch). Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> | ||
* | git-debrebase: Recognise anchors by commit annotation, only | Ian Jackson | 2018-06-16 |
| | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> | ||
* | git-debrebase: docs etc.: Intend to recognise anchors by commit annotation | Ian Jackson | 2018-06-16 |
| | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> | ||
* | git-debrebase: Introduce term `anchor' | Ian Jackson | 2018-06-16 |
| | | | | | | | And replace `breakwater merge' and `breakwater upstream merge' everywhere. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> | ||
* | git-debrebase: NOTES: done test suite, pretty much | Ian Jackson | 2018-06-16 |
| | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> | ||
* | git-debrebase: convert-to-gbp: mention commit tag | Ian Jackson | 2018-06-16 |
| | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> | ||
* | git-debrebase: NOTES: avoid merges | Ian Jackson | 2018-06-16 |
| | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> | ||
* | git-debrebase: NOTES: about divergence and merges | Ian Jackson | 2018-06-16 |
| | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> | ||
* | git-debrebase: rename gbp2gdr to convert-from-gbp | Ian Jackson | 2018-06-16 |
| | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> | ||
* | git-debrebase: NOTES: another todo | Ian Jackson | 2018-06-16 |
| | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> | ||
* | git-debrebase: some NOTES | Ian Jackson | 2018-06-16 |
| | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> | ||
* | git-debrebase: record ffq-prev on rebase | Ian Jackson | 2018-06-16 |
| | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> | ||
* | git-debrebase: notes re ffq-prev ref name | Ian Jackson | 2018-06-16 |
| | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> | ||
* | git-debrebase: intent re record-ffqrebase | Ian Jackson | 2018-06-16 |
| | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> | ||
* | git-debrebase: intent re record-ffrebase | Ian Jackson | 2018-06-16 |
| | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> | ||
* | git-debrebase: more notes | Ian Jackson | 2018-06-16 |
| | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> | ||
* | git-debrebase: note re debrebase push? | Ian Jackson | 2018-06-16 |
| | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> | ||
* | git-debrebase: decide: make few pseudomerges, and preserve them | Ian Jackson | 2018-06-16 |
| | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> | ||
* | git-debrebase: notes re psuedomerges | Ian Jackson | 2018-06-16 |
| | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> | ||
* | git-debrebase: notes | Ian Jackson | 2018-06-16 |
| | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> | ||
* | git-debrebase: note that we have mostly done the gbp import | Ian Jackson | 2018-06-16 |
| | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> | ||
* | git-debrebase: explain why breakwater bases must be merges | Ian Jackson | 2018-06-16 |
| | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> | ||
* | git-debrebase: rework commit annotations | Ian Jackson | 2018-06-16 |
| | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> | ||
* | git-debrebase: list tags currently written | Ian Jackson | 2018-06-16 |
| | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> | ||
* | git-debrebase: some notes about gbp import | Ian Jackson | 2018-06-16 |
| | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> | ||
* | git-debrebase: docs updates | Ian Jackson | 2018-06-16 |
| | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> | ||
* | git-debrebase: rename NOTES to be more generic | Ian Jackson | 2018-06-16 |