diff options
author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-06-19 17:02:27 +0100 |
---|---|---|
committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-06-20 14:29:38 +0100 |
commit | 8417abd83a6d2659bd556476ddee0a232d579eca (patch) | |
tree | d04f98bf4295c273884037b2f6c38a57180aebf0 /tests/tests/gitattributes | |
parent | da6f19f4f54e84723e9d1435bcfd4f7db8e55986 (diff) |
git-debrebase: new-upstream: fix ff check handling of multi-piece upstreams
Multi-piece combine commits may have n or n+1 parents, depending on
whether the previous new-upstream invocation was snag-free.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Diffstat (limited to 'tests/tests/gitattributes')
0 files changed, 0 insertions, 0 deletions