|author||Sean Whitton <email@example.com>||2018-08-26 09:24:13 -0700|
|committer||Ian Jackson <firstname.lastname@example.org>||2018-08-26 19:09:42 +0100|
dgit-maint-debrebase(7): Avoid some uses of =item
Commands for the user to type into their shell should have empty lines above and below them; this ensures that. Admittedly while making the POD source harder to read. Signed-off-by: Sean Whitton <email@example.com>
Diffstat (limited to 'dgit-maint-debrebase.7.pod')
1 files changed, 17 insertions, 9 deletions
diff --git a/dgit-maint-debrebase.7.pod b/dgit-maint-debrebase.7.pod
index 675e2f3..cc393b5 100644
@@ -629,23 +629,27 @@ 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.
+History of package in Debian, disregarding history from upstream:
-=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)
+History of the packaging, excluding the delta queue:
% gitk :/debian :!/debian/patches
-=item Just the delta queue (ie, Debian's changes to upstream):
+Just the delta queue (i.e. Debian's changes to upstream):
% gitk --first-parent -- :/ :!/debian
-=item Full history including old versions of the delta queue:
+Full history including old versions of the delta queue:
% gitk --date-order
@@ -654,18 +658,22 @@ The "Declare fast forward" commits you see have an older history
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:
+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:
+Interdiff of delta queue since last upload, if you really want it:
% git debrebase make-patches
% git diff dgit/dgit/sid..HEAD -- debian/patches
Also of course there is
% git debrebase status