diff options
| author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-08-11 22:57:23 +0100 |
|---|---|---|
| committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-08-12 01:50:13 +0100 |
| commit | e2ef34589c5758d96f492bec534eb9b3398fa960 (patch) | |
| tree | 08a498982c8c2398054da53e7cfc4da6d0aa2cc6 /git-debrebase | |
| parent | e06f678462c60f83e45ad32328f4633390983341 (diff) | |
git-debrebase: merge: conflict: Some xxx's now done
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Diffstat (limited to 'git-debrebase')
| -rwxr-xr-x | git-debrebase | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/git-debrebase b/git-debrebase index f9b6254..41373f3 100755 --- a/git-debrebase +++ b/git-debrebase @@ -373,9 +373,6 @@ sub gbp_pq_export ($$$) { # xxx general gdr docs highlight forbidden things # xxx general gdr docs list allowable things ? # xxx general gdr docs explicitly forbid some rebase -# -# xxx provide a way for the user to help -# xxx (eg, provide wreckage provide way to continue) # later/rework? # use git-format-patch? |