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): add another "# if needed"
[dgit.git]
/
dgit-maint-debrebase.7.pod
diff --git
a/dgit-maint-debrebase.7.pod
b/dgit-maint-debrebase.7.pod
index 3c6e2fd00a84d399c4c1fd2a1a9a156a9ce4164d..fb7c1e18cf60f003c08d8de43d34166b3e45a68d 100644
(file)
--- a/
dgit-maint-debrebase.7.pod
+++ b/
dgit-maint-debrebase.7.pod
@@
-467,7
+467,7
@@
And for subsequent releases (whether or not they require filtering):
% git checkout upstream-dfsg
% git merge 1.2.4
% git rm further-evil.bin # if needed
% git checkout upstream-dfsg
% git merge 1.2.4
% git rm further-evil.bin # if needed
- % git commit -m "upstream version 1.2.4 DFSG-cleaned"
+ % 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"
% git tag -s 1.2.4+dfsg
% git checkout master
% # proceed with "Importing the release"