Package: git-debrebase Version: 6.9 During a conversation on pkg-xen-devel, it became evident that there is too little advice on how to examine things when using git-debrebase. There's a lot of advice on how to change things, but little on how to see what they're currently like. Without this advice the whole workflow can be a bit disorienting.
I wrote some text in an email to pkg-xen-devel (see below). I think something like this should be in some manpage. Should this be in dgit-maint-debrebase(7) ? Or git-debrebase(5) ? Do we need a git-debrebase(7) too ? Ian. The normal git commands for viewing subsets of the history can be used. Let me make some suggestions: History of package in Debian (disregards upstream history) gitk --first-parent In a laundered branch, the delta queue is at the top. History of the packaging (excluding the delta queue) gitk :/debian :!/debian/patches Just the delta queue (ie, Debian's changes to upstream): gitk --first-parent -- :/ :!/debian Full history including old versions of the delta queue: gitk --date-order The "Declare fast forward" commits you see have an older history (usually, an older delta queue) as one parent, and a newer history as the other. --date-order makes gitk show the delta queues in order. Show complete diff since the last upload: git diff dgit/dgit/sid..HEAD -- :/ :!/debian/patches (Includes changes to upstream files.) Show interdiff of patches, if you really want that: git debrebase make-patches git diff dgit/dgit/sid..HEAD -- debian/patches Also of course there is git debrebase status I think some of this information should be in the manpages. I'll file a bug about that. -- Ian Jackson <ijack...@chiark.greenend.org.uk> These opinions are my own. If I emailed you from an address @fyvzl.net or @evade.org.uk, that is a private address which bypasses my fierce spamfilter.