summaryrefslogtreecommitdiff
path: root/git-debrebase
Commit message (Collapse)AuthorAge
* git-debrebase(1): document record-ffq-prevIan Jackson2018-06-16
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* git-debrebase(1): document some moreIan Jackson2018-06-16
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* git-debrebase(1): document convert-to-gbpIan Jackson2018-06-16
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* git-debrebase(1): document convert-from-gbpIan Jackson2018-06-16
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* git-debrebase(1): wipIan Jackson2018-06-16
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* git-debrebase(5): Document commit message annotationsIan Jackson2018-06-16
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* git-debrebase: provide --anchor optionIan Jackson2018-06-16
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* git-debrebase: new-upstream-v0: allow upstream to be omittedIan Jackson2018-06-16
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* git-debrebase: new-upstream-v0: call record_ffq_auto (nfc)Ian Jackson2018-06-16
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* git-debrebase: introduce record_ffq_auto (nfc)Ian Jackson2018-06-16
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* git-debrebase: renmae $old_upstream_update* to $old_anchor* (nfc)Ian Jackson2018-06-16
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* git-debrebase: do remaining ref update atomicallyIan Jackson2018-06-16
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* git-debrebase: do most ref updates together, atomicallyIan Jackson2018-06-16
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* git-debrebase: stitch: add an update-ref messageIan Jackson2018-06-16
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* git-debrebase: stitch: ff when possibleIan Jackson2018-06-16
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* git-debrebase: be properly selective about StartRewriteIan Jackson2018-06-16
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* git-debrebase: Rename `launder' to `launder-v0'Ian Jackson2018-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, onlyIan Jackson2018-06-16
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* git-debrebase: Recognise anchors by commit annotationIan Jackson2018-06-16
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* git-debrebase: Introduce term `anchor'Ian Jackson2018-06-16
| | | | | | | And replace `breakwater merge' and `breakwater upstream merge' everywhere. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* git-debrebase: fix ffq divergence checking (many bugs)Ian Jackson2018-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 Jackson2018-06-16
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* git-debrebase: do not bomb on totally ambiguous pseudomergesIan Jackson2018-06-16
| | | | | | | Actually, we want `git-merge -s ours' (or `git-debrebase stitch') to be comprehended. We sacrifice `git-merge -s theirs'. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* git-debrebase: print more why on Unprocessable commitsIan Jackson2018-06-16
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* git-debrebase: bomb on totally ambiguous pseudomergesIan Jackson2018-06-16
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* git-debrebase: convert-from-gbp: fix usage commentIan Jackson2018-06-16
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* git-debrebase: convert-to-gbp: declare it not v0Ian Jackson2018-06-16
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* git-debrebase: convert-to-gbp: implementation seems to workIan Jackson2018-06-16
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* git-debrebase: provide breakwater commandIan Jackson2018-06-16
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* git-debrebase: classify: provide Why for UnknownIan Jackson2018-06-16
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* git-debrebase: slight message improvements etc.Ian Jackson2018-06-16
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* git-debrebase: rename gbp2gdr to convert-from-gbpIan Jackson2018-06-16
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* git-debrebase: bugfixIan Jackson2018-06-16
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* git-debrebase: drop a superfluous rm_subdir_cached qw(debian/patches)Ian Jackson2018-06-16
| | | | | | This is done by $read_tree_debian->($cltree). So nfc. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* git-debrebase: dgit import: honour $upp_limitIan Jackson2018-06-16
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* git-debrebase: DgitImportUnpatched: defer upstream diff checkIan Jackson2018-06-16
| | | | | | | | | | | | | We can't do this during the initial walk, because what we ought to be comparing is the previous breakwater with the new one. So we have to wait until the walk has proceeded down the overwritten branch, to find the old breakwater. This can be done by waiting until we are rebuilding the branch: at that point, we have just built the previous breakwater, so we can compare it to the dgit unpatched import. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* git-debrebase: fix Overwritten to be an array like it says, etc.Ian Jackson2018-06-16
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* git-debrebase: stitch betterIan Jackson2018-06-16
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* git-debrebase: wip stitchIan Jackson2018-06-16
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* git-debrebase: record ffq-prev on rebaseIan Jackson2018-06-16
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* git-debrebase: break out ffq_prev_branchinfo (nfc)Ian Jackson2018-06-16
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* git-debrebase: fix $/ to be local in cfg (!)Ian Jackson2018-06-16
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* git-debrebase: do not add -i in default invocationIan Jackson2018-06-16
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* git-debrebase: check head is clean before startingIan Jackson2018-06-16
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* git-debrebase: use git_rev_parse 'HEAD' for "internal" head lookupsIan Jackson2018-06-16
| | | | | | We are going to make get_head check the tree is clean Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* git-debrebase: for master branch, check dgit/dgit/sid tooIan Jackson2018-06-16
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* git-debrebase: bugfixes to record_ffq_prevIan Jackson2018-06-16
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* git-debrebase: make cfg optionally take $optional (nfc)Ian Jackson2018-06-16
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* git-debrebase: wip cmd_record_ffq_prevIan Jackson2018-06-16
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* git-debrebase: provide record_ffq_prev (no callers yet)Ian Jackson2018-06-16
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>