Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | git-debrebase(1): document some more | Ian Jackson | 2018-06-16 |
| | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> | ||
* | git-debrebase(1): document convert-to-gbp | Ian Jackson | 2018-06-16 |
| | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> | ||
* | git-debrebase(1): document convert-from-gbp | 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(5): Terminology fixes, cleanups | Ian Jackson | 2018-06-16 |
| | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> | ||
* | git-debrebase(5): All of README now in (5) | Ian Jackson | 2018-06-16 |
| | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> | ||
* | git-debrebase(5): more from README | Ian Jackson | 2018-06-16 |
| | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> | ||
* | git-debrebase(5): tidying up | Ian Jackson | 2018-06-16 |
| | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> | ||
* | git-debrebase(5): copy more stuff from README | Ian Jackson | 2018-06-16 |
| | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> | ||
* | git-debrebase(5): wip, converting from README | 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: add some t-git-next-date | Ian Jackson | 2018-06-16 |
| | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> | ||
* | git-debrebase: test suite: test --anchor option | Ian Jackson | 2018-06-16 |
| | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> | ||
* | git-debrebase: provide --anchor option | Ian Jackson | 2018-06-16 |
| | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> | ||
* | git-debrebase: test suite: gdr-newupstream-v0: omit upstream | Ian Jackson | 2018-06-16 |
| | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> | ||
* | git-debrebase: new-upstream-v0: allow upstream to be omitted | 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: new-upstream-v0: call record_ffq_auto (nfc) | Ian Jackson | 2018-06-16 |
| | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> | ||
* | git-debrebase: introduce record_ffq_auto (nfc) | 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: renmae $old_upstream_update* to $old_anchor* (nfc) | Ian Jackson | 2018-06-16 |
| | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> | ||
* | git-debrebase: do remaining ref update atomically | Ian Jackson | 2018-06-16 |
| | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> | ||
* | git-debrebase: do most ref updates together, atomically | Ian Jackson | 2018-06-16 |
| | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> | ||
* | git-debrebase: test suite: t-gdr-good: fix comment | Ian Jackson | 2018-06-16 |
| | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> | ||
* | git-debrebase: test suite: test ff stitching | Ian Jackson | 2018-06-16 |
| | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> | ||
* | git-debrebase: stitch: add an update-ref message | Ian Jackson | 2018-06-16 |
| | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> | ||
* | git-debrebase: stitch: ff when possible | Ian Jackson | 2018-06-16 |
| | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> | ||
* | git-debrebase: be properly selective about StartRewrite | Ian Jackson | 2018-06-16 |
| | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> | ||
* | git-debrebase: test suite: spot any pointless pseudomerges | Ian Jackson | 2018-06-16 |
| | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> | ||
* | git-debrebase: test suite: spot any merges which have multiple identical parents | 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: Recognise anchors by commit annotation | 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: README: change diagrams to use @ for anchor | 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: test suite: gdr nmu divergence: check that divergence check ↵ | Ian Jackson | 2018-06-16 |
| | | | | | | trips on nmus Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> | ||
* | git-debrebase: fix ffq divergence checking (many bugs) | Ian Jackson | 2018-06-16 |
| | | | | | | Also add some debugging to ffq checking Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> | ||
* | git-debrebase: fix cfg in scalar context (!) | Ian Jackson | 2018-06-16 |
| | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> | ||
* | git-debrebase: test suite: gdr nmu divergence: do maintainer first | Ian Jackson | 2018-06-16 |
| | | | | | | | | In practical terms this is needed because we are only using one tree, and otherwise the nmu's dgit push will update dgit/dgit/sid, causing the ffq check to fail (when we fix it, in a moment). Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> | ||
* | git-debrebase: test suite: gdr-*: break out t-nmu-causes-ff-fail | Ian Jackson | 2018-06-16 |
| | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> | ||
* | git-debrebase: test suite: gdr-diverge-nmu-dgit: new test | Ian Jackson | 2018-06-16 |
| | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> | ||
* | git-debrebase: test suite: lib-gdr: break out some more t-* | Ian Jackson | 2018-06-16 |
| | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> |