chiark / gitweb /
~ianmdlvl / dgit.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 965fdfe) | patch
git-debrebase: merge: Avoid asking user to re-merge debian/
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Sat, 11 Aug 2018 12:47:59 +0000 (13:47 +0100)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Sat, 11 Aug 2018 14:36:23 +0000 (15:36 +0100)
commit14940a67eb1525d69a8dade2777f8cd11200307c
tree23f9c57e34d02400ecc9f469496f457f709f0a55tree | snapshot
parent965fdfed6e03d38b273baf1fa282a3d2ef828484commit | diff
git-debrebase: merge: Avoid asking user to re-merge debian/

If it had conflicts, they will have been resolved earlier and we can
just take that resolution.

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