chiark
/
gitweb
/
~ianmdlvl
/
dgit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
i18n: i18n-diff-auditor: add copyright notice
[dgit.git]
/
dgit-maint-debrebase.7.pod
diff --git
a/dgit-maint-debrebase.7.pod
b/dgit-maint-debrebase.7.pod
index cc393b579866c4e1762a012a44a390e9cf7ef1da..e5abe1773c604e4913f985468288283f91e37901 100644
(file)
--- a/
dgit-maint-debrebase.7.pod
+++ b/
dgit-maint-debrebase.7.pod
@@
-627,7
+627,7
@@
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.
History of package in Debian, disregarding history from upstream:
History of package in Debian, disregarding history from upstream:
@@
-665,7
+665,8
@@
Complete diff since the last upload:
=over
% git diff dgit/dgit/sid..HEAD -- :/ :!/debian/patches
=over
% git diff dgit/dgit/sid..HEAD -- :/ :!/debian/patches
-(Includes changes to upstream files.)
+
+This includes changes to upstream files.
=back
=back
@@
-674,7
+675,7
@@
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
-A
lso of course there is
+A
nd of course there is:
% git debrebase status
% git debrebase status