chiark / gitweb /
~ianmdlvl / dgit.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: cfbec7a) | patch
git-debrebase: merge: Get debian/ parts of new patch queue right
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Sat, 11 Aug 2018 12:25:41 +0000 (13:25 +0100)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Sat, 11 Aug 2018 14:36:23 +0000 (15:36 +0100)
commit5f0580a8bbf6460363d208acfab53714f190a7a6
treebdf078261c499889fdc9fe24cebe1e2d219fa9d0tree | snapshot
parentcfbec7a706fd1f631ebbed0c545980590eb26656commit | diff
git-debrebase: merge: Get debian/ parts of new patch queue right

We want the newly generated delta queue commits to have the $newbase's
debian/.  Previously we let read_tree_upstream save and restore
debian/, but the contents of debian/ in the index are not right:
they're the result of the git merge, which is whatever is left over
from earlier.

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.