summaryrefslogtreecommitdiff
path: root/dgit.1
diff options
context:
space:
mode:
authorIan Jackson <ijackson@chiark.greenend.org.uk>2015-07-20 13:35:47 +0100
committerIan Jackson <ijackson@chiark.greenend.org.uk>2015-07-20 13:35:47 +0100
commitac2a575234ee8d5fff62cfd5d181ecfab95be497 (patch)
tree1acd8c61489b45c81c9c8c0999528d183881ed25 /dgit.1
parent68a8f001e52757fa9b5ae3289eaf1e6a8dc65512 (diff)
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.
Diffstat (limited to 'dgit.1')
-rw-r--r--dgit.12
1 files changed, 1 insertions, 1 deletions
diff --git a/dgit.1 b/dgit.1
index 8ddab7a..1204f4e 100644
--- a/dgit.1
+++ b/dgit.1
@@ -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).