diff options
| author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-08-19 20:45:19 +0100 |
|---|---|---|
| committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-08-19 21:14:39 +0100 |
| commit | d74ea48e54d4bf0902bfe2364cde833d27e40ad8 (patch) | |
| tree | a30ad7370df006cc4b3cd96d5511054ce09c0289 /git-debrebase | |
| parent | 7bc6dfb448ed6279adb7a3eafa3dcc86a2c111b5 (diff) | |
git-debrebase: Merge: Make a todo about gbp not round tripping
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Diffstat (limited to 'git-debrebase')
| -rwxr-xr-x | git-debrebase | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/git-debrebase b/git-debrebase index 706af54..3be444b 100755 --- a/git-debrebase +++ b/git-debrebase @@ -681,6 +681,8 @@ sub merge_series_patchqueue_convert ($$$) { runcmd @git, qw(checkout -q -b mergec), $merged_pq; merge_attempt_cmd($wrecknotes, qw(gbp pq import)); + # MERGE-TODO consider git-format-patch etc. instead, + # since gbp pq doesn't always round-trip :-/ # OK now we are on patch-queue/merge, and we need to rebase # onto the intended parent and drop the patches from each one |