path: root/dgit-maint-debrebase.7.pod
diff options
authorIan Jackson <>2018-08-25 17:50:57 +0100
committerIan Jackson <>2018-08-26 01:20:44 +0100
commit72ce6d23ca6a10fcab21410d202ec8ad5fc2aeb9 (patch)
tree4a5b247dee843dbb1bd80159d8088de304b33d03 /dgit-maint-debrebase.7.pod
parent075e5ee39813f272713793fd8b778c81697e24e2 (diff)
dgit-maint-debrebase(7): Add runes for inspecting history
I'm not sure if this is the right place but I wanted to publish this information sooner rather than later. Closes: #907190. Signed-off-by: Ian Jackson <>
Diffstat (limited to 'dgit-maint-debrebase.7.pod')
1 files changed, 47 insertions, 0 deletions
diff --git a/dgit-maint-debrebase.7.pod b/dgit-maint-debrebase.7.pod
index 16b65b3..b4330f9 100644
--- a/dgit-maint-debrebase.7.pod
+++ b/dgit-maint-debrebase.7.pod
@@ -458,6 +458,53 @@ Note that this will introduce a new pseudomerge.
After dgit pushing, be sure to git push to B<>, if
you're using that.
+The git history made by git-debrebase can seem complicated.
+Here are some suggestions for helpful invocations of gitk and git.
+They can be adapted for other tools like tig, git log, etc.
+=item History of package in Debian (disregarding history from upstream):
+ % gitk --first-parent
+In a laundered branch, the delta queue is at the top.
+=item History of the packaging (excluding the delta queue)
+ % gitk :/debian :!/debian/patches
+=item Just the delta queue (ie, Debian's changes to upstream):
+ % gitk --first-parent -- :/ :!/debian
+=item 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 the right order.
+=item Show complete diff since the last upload:
+ % git diff dgit/dgit/sid..HEAD -- :/ :!/debian/patches
+(Includes changes to upstream files.)
+=item Interdiff of delta queue since last upload, 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
=head2 Illegal material