Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | git-debrebase: insist that breakwater merges are merges | Ian Jackson | 2018-06-16 |
| | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> | ||
* | git-debrebase: introduce $claims_to_be_breakwater (nfc) | Ian Jackson | 2018-06-16 |
| | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> | ||
* | git-debrebase: fix misdetection of breakwater declarations as other pseudomerges | 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: bugfixes | Ian Jackson | 2018-06-16 |
| | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> | ||
* | git-debrebase: wip gbp2debrebase | Ian Jackson | 2018-06-16 |
| | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> | ||
* | git-debrebase: fix break out fproblem | Ian Jackson | 2018-06-16 |
| | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> | ||
* | git-debrebase: fix several calls to git_cat_file | Ian Jackson | 2018-06-16 |
| | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> | ||
* | git-debrebase: in new-upstream-v0 tolerate planned upstream-combine commits ↵ | Ian Jackson | 2018-06-16 |
| | | | | | | which are not necessary *new* upstream (eg gbp import) Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> | ||
* | git-debrebase: break out fproblem | 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: provide default rebase action | Ian Jackson | 2018-06-16 |
| | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> | ||
* | git-debrebase: update_head_postlaunder: print a message, if anything changed | Ian Jackson | 2018-06-16 |
| | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> | ||
* | git-debrebase: new-upstream-v0: support passing git-rebase options | Ian Jackson | 2018-06-16 |
| | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> | ||
* | git-debrebase: new-upstream-v0: use update_head_postlaunder | Ian Jackson | 2018-06-16 |
| | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> | ||
* | git-debrebase: fix changelog manip | Ian Jackson | 2018-06-16 |
| | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> | ||
* | git-debrebase: break out update_head_postlaunder (nfc) | Ian Jackson | 2018-06-16 |
| | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> | ||
* | git-debrebase: whitespace | Ian Jackson | 2018-06-16 |
| | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> | ||
* | git-debrebase: new-upstream-v0: use make_commit another time (nfc) | Ian Jackson | 2018-06-16 |
| | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> | ||
* | git-debrebase: new-upstream-v0 break out make_commit | Ian Jackson | 2018-06-16 |
| | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> | ||
* | git-debrebase: new-upstream-v0 bugfixes | Ian Jackson | 2018-06-16 |
| | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> | ||
* | git-debrebase: break out dd (nfc) | Ian Jackson | 2018-06-16 |
| | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> | ||
* | git-debrebase: walk: print some more debug | Ian Jackson | 2018-06-16 |
| | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> | ||
* | git-debrebase: parsecommit: fix confusing wrong handedness in breakwater ↵ | Ian Jackson | 2018-06-16 |
| | | | | | | merge classify Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> | ||
* | git-debrebase: parsecommit: fix Ix to not be off-by-one | Ian Jackson | 2018-06-16 |
| | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> | ||
* | git-debrebase: new-upstream-v0: fixes | Ian Jackson | 2018-06-16 |
| | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> | ||
* | git-debrebase: launder: print last upstream merge too | Ian Jackson | 2018-06-16 |
| | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> | ||
* | git-debrebase: drop d/patches from all laundered commits | Ian Jackson | 2018-06-16 |
| | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> | ||
* | git-debrebase: new-upstream-v0: use last upstream merge in breakwater branch | Ian Jackson | 2018-06-16 |
| | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> | ||
* | git-debrebase: walk: return last upstream merge in breakwater branch | Ian Jackson | 2018-06-16 |
| | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> | ||
* | git-debrebase: bugfix | Ian Jackson | 2018-06-16 |
| | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> | ||
* | git-debrebase: BUG due to some evidently unfinished code | Ian Jackson | 2018-06-16 |
| | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> | ||
* | git-debrebase: syntax fixes | Ian Jackson | 2018-06-16 |
| | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> | ||
* | git-debrebase: wip new-upstream, ready for testing | Ian Jackson | 2018-06-16 |
| | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> | ||
* | git-debrebase: new-upstream wip | Ian Jackson | 2018-06-16 |
| | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> | ||
* | git-debrebase: new-upstream wip | Ian Jackson | 2018-06-16 |
| | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> | ||
* | git-debrebase: add --force option (no users, so nfc) | Ian Jackson | 2018-06-16 |
| | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> | ||
* | git-debrebase: break out read_tree_subdir (nfc) | Ian Jackson | 2018-06-16 |
| | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> | ||
* | git-debrebase: break out rm_subdir_cached (nfc) | Ian Jackson | 2018-06-16 |
| | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> | ||
* | git-debrebase: wip new-upstream | Ian Jackson | 2018-06-16 |
| | | | | | | | | before needing to unpick multi-upstream also realise need to parse breakwater to check we are not ff only due to combination merge Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> | ||
* | git-debrebase: fix: document that breakwater merges always have single parent | Ian Jackson | 2018-06-16 |
| | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> | ||
* | git-debrebase: break out parsecommit | Ian Jackson | 2018-06-16 |
| | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> | ||
* | git-debrebase: document that breakwater merges always have single parent | Ian Jackson | 2018-06-16 |
| | | | | | | multi-orig upstreams will get a separate commit merging the upstream stuff Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> | ||
* | git-debrebase: launder: debug print why rewriting if out-of-order | Ian Jackson | 2018-06-16 |
| | |||
* | git-debrebase: bugfixes | Ian Jackson | 2018-06-16 |
| | | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> | ||
* | git-debrebase: launder: print working tip too | Ian Jackson | 2018-06-16 |
| | |||
* | git-debrebase: fix rm of debian/patches not to mind if there aren't any | Ian Jackson | 2018-06-16 |
| | |||
* | git-debrebase: fix final diff check | Ian Jackson | 2018-06-16 |
| | |||
* | git-debrebase: fix parents in generated commits (!) | Ian Jackson | 2018-06-16 |
| |