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-maint-debrebase(7): tweak instructions to import DFSG-clean tag
[dgit.git]
/
dgit-maint-debrebase.7.pod
diff --git
a/dgit-maint-debrebase.7.pod
b/dgit-maint-debrebase.7.pod
index fb7c1e18cf60f003c08d8de43d34166b3e45a68d..297bf48cce026ba6a7210948dec4615220ac93bf 100644
(file)
--- a/
dgit-maint-debrebase.7.pod
+++ b/
dgit-maint-debrebase.7.pod
@@
-456,7
+456,7
@@
For the first upstream release that requires DFSG filtering:
% git commit -m "upstream version 1.2.3 DFSG-cleaned"
% git tag -s 1.2.3+dfsg
% git checkout master
% git commit -m "upstream version 1.2.3 DFSG-cleaned"
% git tag -s 1.2.3+dfsg
% git checkout master
- % # proceed with "Importing the release"
+ % # proceed with "Importing the release"
on 1.2.3+dfsg tag
=back
=back
@@
-470,7
+470,7
@@
And for subsequent releases (whether or not they require filtering):
% git commit -m "upstream version 1.2.4 DFSG-cleaned" # if needed
% git tag -s 1.2.4+dfsg
% git checkout master
% git commit -m "upstream version 1.2.4 DFSG-cleaned" # if needed
% git tag -s 1.2.4+dfsg
% git checkout master
- % # proceed with "Importing the release"
+ % # proceed with "Importing the release"
on 1.2.4+dfsg tag
=back
=back