1 [[!meta title="Mastering the DragonFly git repository"]]
4 ## Clone the repository
7 First you go in your work directory and clone the DragonFly repository.
9 > git clone git://git.dragonflybsd.org/dragonfly.git
10 Or even better on a DragonFly system just use make
15 If you are a committer, you should create a ***remote*** entry for pushing to ***crater***:
18 > git remote add crater ssh://crater.dragonflybsd.org/repository/git/dragonfly.git
20 Clone creates remote-tracking branches for all branches in the parent repo and creates a local **master** branch from the remote **master** branch.
26 chlamydia/DragonFly_RELEASE_1_10
27 chlamydia/DragonFly_RELEASE_1_12
28 chlamydia/DragonFly_RELEASE_1_2
29 chlamydia/DragonFly_RELEASE_1_4
30 chlamydia/DragonFly_RELEASE_1_6
31 chlamydia/DragonFly_RELEASE_1_8
32 chlamydia/DragonFly_RELEASE_2_0
36 chlamydia/vendor/ATHEROS
42 If you (as a non-developer) made some changes to the DragonFly source and want to get them included in the main repository, send your patches to submit@lists.dragonflybsd.org. git assists you in creating patches which are easy to handle for the developers.
46 **Note:** The change in this example is completely useless, it only serves demonstration purposes!
50 At first edit the files you want to change:
54 Then review your changes with `git diff`:
59 diff --git a/README b/README
60 index 495a262..6a95d1f 100644
63 @@ -59,7 +59,7 @@ lib System libraries
65 libexec System daemons.
67 -nrelease Framework for building the ***live*** CD image.
68 +nrelease Framework for building the ***live CD*** image.
73 If you are satisfied with your changes, commit them. **Note:** The first line of your commit message should describe your change in a small sentence. Add more details after one newline.
78 ".git/COMMIT_EDITMSG" 10L, 342C written
79 Created commit cbb871b: Change parentheses
80 1 files changed, 1 insertions(+), 1 deletions(-)
82 Now you can use `git format-patch` to generate a patch file. This file is ready for submission to submit@. `git format-patch` will generate one file for every commit you did.
86 > git format-patch origin
87 0001-Change-parentheses.patch
88 > cat 0001-Change-parentheses.patch
89 From cbb871b4588c695f000bc701b4f3c16a0a518991 Mon Sep 17 00:00:00 2001
90 From: Matthias Schmidt <matthiasdragonflybsd.org>
91 Date: Tue, 2 Dec 2008 09:54:47 +0100
92 Subject: [PATCH] Change parentheses
97 1 files changed, 1 insertions(+), 1 deletions(-)
101 diff --git a/README b/README
102 index 495a262..6a95d1f 100644
105 @@ -59,7 +59,7 @@ lib System libraries.
107 libexec System daemons.
109 -nrelease Framework for building the ***live*** CD image.
110 +nrelease Framework for building the ***live CD*** image.
112 sbin System commands.
118 Attach the generated files to a mail and submit it. Write some lines about your intention and why you changed what ...
122 ## Working with branches
124 It is **not** recommended to work directly in your **master** branch, except maybe for one-liners. Branches in git are very cheap, so just keep your **master** branch pure, and always work on a different local branch.
126 Say you want to work on a simple change. Just create a temporary branch, make the change and commit it.
130 > git checkout -b work # you're now in the work branch
134 Now, you can switch back to **master** , merge in the changes in your **work** branch and push away:
138 > git checkout master # you're now in the master branch
139 > git merge work # now master has your changes
141 Afterwards, you may (or not, if you want to do further development) want to delete the **work** branch by
146 For more complex changes, you probably want to create a longer-lived branch. For example
149 > git checkout -b myfeature
151 You can work in the **myfeature** branch until your feature is ready. You can commit there as often as you like. If your work goes on for a significant amount of time, you will want to merge with the upstream **master** from time to time. It is recommended that you use git rebase, so that the merge points won't show up in the repo history on crater (they don't really add much information). For this, you'd do:
154 > git checkout master
156 > git checkout myfeature
160 ## Push your work upstream
162 When you judge that your code is ready for inclusion in mainline, you can merge it into your local **master** branch and push away:
166 > git checkout master
167 > git merge myfeature
171 as the command will not push any branch that is not in the remote repository.