diff options
author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2013-08-16 14:57:42 +0100 |
---|---|---|
committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2013-08-16 14:57:42 +0100 |
commit | 39c6c123ab730d42ec7c9ed01c30e0175c7691e7 (patch) | |
tree | 71e631cbf99b01c5ea7bd0a87b07f3c25b3aec70 /dgit.1 | |
parent | 3f93d55e1ee34f82f041fd9ebe5c30f2bf5f086e (diff) |
fix branch usage
Diffstat (limited to 'dgit.1')
-rw-r--r-- | dgit.1 | 17 |
1 files changed, 14 insertions, 3 deletions
@@ -33,7 +33,9 @@ and .B dgit fetch consult the archive and dgit-repos and fetch and/or construct the git view of the history. With clone, the destination directory (by -default, the package name in the current directory) will be created. +default, the package name in the current directory) will be created, +and the new directory's `origin' remote will be set up to point to +the package's dgit-repos tree. .B dgit build runs @@ -54,13 +56,22 @@ archive. You may use any suitable git workflow with dgit, provided you satisfy dgit's requirements: +dgit maintains what looks a bit like a remote called +.BR dgit , +with one branch per suite. This remote cannot be used with +plain git. + The .B dgit-repos -repository for each package contains one branch per suite named -\fBdgit/\fR\fIsuite\fR. These should be pushed to only by +repository for each package contains one ref per suite named +\fBdrefs/git/\fR\fIsuite\fR. These should be pushed to only by dgit. They are fast forwarding. Each push on this branch corresponds to an upload (or attempted upload). +However, it is perfectly fine to have other branches in dgit-repos; +normally the dgit-repos repo for the package will be accessible via +the remote name `origin'. + dgit push can operate on any commit which is a descendant of the current dgit/suite tip in dgit-repos. |