chiark
/
gitweb
/
~ianmdlvl
/
dgit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
dgit: Demand that all clean modes are handled by clean_tree_check
[dgit.git]
/
dgit-maint-debrebase.7.pod
diff --git
a/dgit-maint-debrebase.7.pod
b/dgit-maint-debrebase.7.pod
index 675e2f3b097a31890e268a1c22a55033d55990ca..e5abe1773c604e4913f985468288283f91e37901 100644
(file)
--- a/
dgit-maint-debrebase.7.pod
+++ b/
dgit-maint-debrebase.7.pod
@@
-627,25
+627,29
@@
package, but this should already be represented in your git history.)
The git history made by git-debrebase can seem complicated.
Here are some suggestions for helpful invocations of gitk and git.
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.
+They can be adapted for other tools like tig
(1), git-log(1), magit
, etc.
-=over
+History of package in Debian, disregarding history from upstream:
-=
item History of package in Debian (disregarding history from upstream):
+=
over
% gitk --first-parent
In a laundered branch, the delta queue is at the top.
% gitk --first-parent
In a laundered branch, the delta queue is at the top.
-=item History of the packaging (excluding the delta queue)
+=back
+
+History of the packaging, excluding the delta queue:
% gitk :/debian :!/debian/patches
% 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
% gitk --first-parent -- :/ :!/debian
-=item Full history including old versions of the delta queue:
+Full history including old versions of the delta queue:
+
+=over
% gitk --date-order
% gitk --date-order
@@
-654,19
+658,24
@@
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.
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:
+=back
+
+Complete diff since the last upload:
+
+=over
% git diff dgit/dgit/sid..HEAD -- :/ :!/debian/patches
% 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:
+This includes changes to upstream files.
+
+=back
+
+Interdiff of delta queue since last upload, if you really want it:
% git debrebase make-patches
% git diff dgit/dgit/sid..HEAD -- debian/patches
% git debrebase make-patches
% git diff dgit/dgit/sid..HEAD -- debian/patches
-=back
-
-Also of course there is
+And of course there is:
% git debrebase status
% git debrebase status