chiark
/
gitweb
/
~ianmdlvl
/
dgit.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(from parent 1:
a090117
)
dgit-maint-debrebase(7): add another "# if needed"
author
Sean Whitton
<spwhitton@spwhitton.name>
Thu, 19 Apr 2018 16:32:33 +0000
(09:32 -0700)
committer
Sean Whitton
<spwhitton@spwhitton.name>
Thu, 19 Apr 2018 16:43:59 +0000
(09:43 -0700)
Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
dgit-maint-debrebase.7.pod
patch
|
blob
|
history
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 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"