From ac2a575234ee8d5fff62cfd5d181ecfab95be497 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Mon, 20 Jul 2015 13:35:47 +0100 Subject: 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. --- dgit.1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'dgit.1') 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). -- cgit v1.2.3