chiark / gitweb /
~ianmdlvl / dgit.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 9cda023) | patch
git-debrebase convert-from-gbp: Add ffq check
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Sun, 8 Jul 2018 19:05:26 +0000 (20:05 +0100)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Sun, 8 Jul 2018 23:29:00 +0000 (00:29 +0100)
commit81e93ac2f3ac0b129f0d5e77d055b99053105892
treebd9d8b4c44a68959546d2a6e8781ddba8ba70fa9tree | snapshot
parent9cda023c0c49449a1d5862483df8d785e062765bcommit | diff
git-debrebase convert-from-gbp: Add ffq check

Check that the result will not count as having diverged.  This will
usually turn failures to make the ff pseudomerge into -fdiverged.

Related to #903132.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
debian/changelog diff | blob | history
git-debrebase diff | blob | history
git-debrebase.1.pod diff | blob | history
Unnamed repository; edit this file 'description' to name the repository.