diff options
| -rw-r--r-- | debian/changelog | 3 | ||||
| -rw-r--r-- | dgit.1 | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog index 47956f4..b8601e3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -14,6 +14,9 @@ dgit (1.1) unstable; urgency=low * In manpage, do not seem to imply that NMU should be of only one new commit. * Qualify to Debian the manpage comment about how to do NMU. + * In discussion on how to start using dgit when already using git, do + not imply/assume that existing git history will have identical trees + to dgit history. -- @@ -566,7 +566,7 @@ branch and merge that other commit .RB ( "git merge debian/" \fIversion\fR). Hopefully this merge will be trivial because the two trees should -be the same. The resulting branch head can be merged into your +be very similar. The resulting branch head can be merged into your working branches .RB ( "git checkout master && git merge dgit/" \fIsuite\fR). |