3 .\" The DragonFly Project. All rights reserved.
5 .\" Redistribution and use in source and binary forms, with or without
6 .\" modification, are permitted provided that the following conditions
9 .\" 1. Redistributions of source code must retain the above copyright
10 .\" notice, this list of conditions and the following disclaimer.
11 .\" 2. Redistributions in binary form must reproduce the above copyright
12 .\" notice, this list of conditions and the following disclaimer in
13 .\" the documentation and/or other materials provided with the
15 .\" 3. Neither the name of The DragonFly Project nor the names of its
16 .\" contributors may be used to endorse or promote products derived
17 .\" from this software without specific, prior written permission.
19 .\" THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
20 .\" ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
21 .\" LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
22 .\" FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
23 .\" COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
24 .\" INCIDENTAL, SPECIAL, EXEMPLARY OR CONSEQUENTIAL DAMAGES (INCLUDING,
25 .\" BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
26 .\" LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
27 .\" AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
28 .\" OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
29 .\" OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
32 .\" $DragonFly: src/share/man/man7/development.7,v 1.12 2008/07/27 22:23:42 thomas Exp $
39 .Nd quick starter for development with the DragonFly codebase
44 distributed revision control system.
45 If it is not already on the system, it needs to be installed via
47 .Pa ( /usr/pkgsrc/devel/scmgit ) .
51 section gives initial information to get going with development on
55 manual pages and other related documents for further information on git's
56 capabilities and how to use them.
58 For information on how to build the
60 system from source code, see
62 For information on how to build the LiveCD, LiveDVD or thumb drive image, see
65 A fresh copy of the repository can be cloned anywhere.
66 Note that the directory to clone into
68 in the following example) must not exist, so all previous work in this
69 directory has to be saved and the directory be removed prior to cloning.
70 Also note that while the main repository is on
72 it is recommended that one of the
74 mirrors be used instead.
76 Simple setup and updating of local repository is done using
78 .Bd -literal -offset 4n
81 make git-clone # initial setup
85 Somewhat finer control can be achieved using
88 To clone the repository and check out the master branch (this will take
90 .Bd -literal -offset 4n
92 git clone -o crater git://crater.dragonflybsd.org/dragonfly.git src
96 The repository can be held up to date by pulling frequently (to set up a
102 .Bd -literal -offset 4n
107 It is not recommended to work directly in the master branch.
108 To create and checkout a working branch:
109 .Bd -literal -offset 4n
113 To create and checkout a branch of the
117 .Bd -literal -offset 4n
118 git checkout -b rel2_0 crater/DragonFly_RELEASE_2_0
121 Branches can be deleted just as easy:
122 .Bd -literal -offset 4n
126 After changes have been made to a branch, they can be committed:
127 .Bd -literal -offset 4n
131 .Xr git-commit 1 Ap s
135 options can be used to specify a commit message on the command line or read
136 it from a file, respectively.
138 Finally, branches can be merged with the (updated) master by using
140 .Bd -literal -offset 4n
147 .Xr git 1 Pq Pa pkgsrc/devel/scmgit ,
154 manual page was originally written by
155 .An Matthew Dillon Aq dillon@FreeBSD.org
160 It was rewritten when