Details | Last modification | View Log | RSS feed
Rev | Author | Line No. | Line |
---|---|---|---|
4349 | Serge | 1 | |
2 | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ |
||
3 | |||
4 | |||
5 | Luckily Git comes with excellent documentation. |
||
6 | |||
7 | |||
8 | man git |
||
9 | |||
10 | |||
11 | |||
12 | |||
13 | man git- |
||
14 | |||
15 | |||
16 | |||
17 | |||
18 | |||
19 | |||
20 | |||
21 | |||
22 | |||
23 | |||
24 | |||
25 | |||
26 | |||
27 | |||
28 | All you need is to provide a ssh public key to the Git server admin. |
||
29 | |||
30 | |||
31 | guidelines. Read it at least once, if you are granted commit privileges to the |
||
32 | FFmpeg project you are expected to be familiar with these rules. |
||
33 | |||
34 | |||
35 | |||
36 | |||
37 | ========== |
||
38 | |||
39 | |||
40 | |||
41 | |||
42 | You can get git from http://git-scm.com/ |
||
43 | |||
44 | |||
45 | |||
46 | |||
47 | |||
48 | |||
49 | |||
50 | |||
51 | |||
52 | |||
53 | |||
54 | you push back your changes to the remote repository. |
||
55 | |||
56 | |||
57 | |||
58 | |||
59 | |||
60 | |||
61 | |||
62 | can be remote. By default the master branch tracks the branch master in |
||
63 | the remote origin. |
||
64 | Caveat: Since merge commits are forbidden at least for the initial |
||
65 | months of git --ff-only or --rebase (see below) are recommended. |
||
66 | --ff-only will fail and not create merge commits if your branch |
||
67 | has diverged (has a different history) from the tracked branch. |
||
68 | |||
69 | |||
70 | |||
71 | |||
72 | |||
73 | |||
74 | over it. This is required to keep all your local changes at the top of |
||
75 | FFmpeg's master tree. The master tree will reject pushes with merge commits. |
||
76 | |||
77 | |||
78 | |||
79 | |||
80 | |||
81 | git rm [-r] |
||
82 | |||
83 | |||
84 | directory that makes files appear or disappear. |
||
85 | Line moves across files are automatically tracked. |
||
86 | |||
87 | |||
88 | |||
89 | |||
90 | |||
91 | |||
92 | |||
93 | |||
94 | |||
95 | |||
96 | |||
97 | |||
98 | |||
99 | |||
100 | interface available at http://source.ffmpeg.org |
||
101 | |||
102 | |||
103 | |||
104 | |||
105 | |||
106 | |||
107 | of a commit (additions, modifications, deletions, etc.). |
||
108 | |||
109 | |||
110 | |||
111 | |||
112 | |||
113 | |||
114 | |||
115 | on. All experienced developers do this on each and every commit, no matter |
||
116 | how small. |
||
117 | Every one of them has been saved from looking like a fool by this many times. |
||
118 | It's very easy for stray debug output or cosmetic modifications to slip in, |
||
119 | please avoid problems through this extra level of scrutiny. |
||
120 | |||
121 | |||
122 | |||
123 | |||
124 | |||
125 | |||
126 | |||
127 | |||
128 | |||
129 | |||
130 | |||
131 | |||
132 | |||
133 | |||
134 | git config --global user.name "My Name" |
||
135 | git config --global user.email my@email.invalid |
||
136 | (--global to set the global configuration for all your git checkouts). |
||
137 | |||
138 | |||
139 | the interactive or the patch mode to select hunk by hunk what should be |
||
140 | added to the commit. |
||
141 | |||
142 | |||
143 | |||
144 | |||
145 | |||
146 | |||
147 | set in your personal configuration file through |
||
148 | |||
149 | |||
150 | |||
151 | |||
152 | GIT_EDITOR, VISUAL or EDITOR. |
||
153 | |||
154 | |||
155 | what you did will be obvious from the changes themselves most of the time. |
||
156 | Saying just "bug fix" or "10l" is bad. Remember that people of varying skill |
||
157 | levels look at and educate themselves while reading through your code. Don't |
||
158 | include filenames in log messages, Git provides that information. |
||
159 | |||
160 | |||
161 | empty line and then a full description. The first line will be used to name |
||
162 | the patch by git format-patch. |
||
163 | |||
164 | |||
165 | |||
166 | |||
167 | |||
168 | |||
169 | |||
170 | |||
171 | |||
172 | |||
173 | |||
174 | |||
175 | |||
176 | discussing it on the mailing list first! |
||
177 | |||
178 | |||
179 | |||
180 | |||
181 | |||
182 | |||
183 | commit disappear from the history. |
||
184 | |||
185 | |||
186 | |||
187 | |||
188 | branch history. |
||
189 | |||
190 | |||
191 | |||
192 | |||
193 | |||
194 | |||
195 | |||
196 | |||
197 | merge or remove some of them in the process. |
||
198 | |||
199 | |||
200 | should use them ONLY on your local or topic branches. |
||
201 | |||
202 | |||
203 | |||
204 | |||
205 | |||
206 | |||
207 | |||
208 | |||
209 | current HEAD. E.g. |
||
210 | |||
211 | |||
212 | |||
213 | |||
214 | present in upstream. |
||
215 | A useful shortcut is also |
||
216 | |||
217 | |||
218 | |||
219 | |||
220 | By default the patches are created in the current directory. |
||
221 | |||
222 | |||
223 | |||
224 | |||
225 | |||
226 | |||
227 | them. All the email fields can be configured in the global/local |
||
228 | configuration or overridden by command line. |
||
229 | Note that this tool must often be installed separately (e.g. git-email |
||
230 | package on Debian-based distros). |
||
231 | |||
232 | |||
233 | |||
234 | |||
235 | |||
236 | |||
237 | Git will prevent you from pushing changes if the local and remote trees are |
||
238 | out of sync. Refer to 2 and 2.a to sync the local tree. |
||
239 | |||
240 | |||
241 | |||
242 | |||
243 | to push your local branch for review on a remote host. |
||
244 | |||
245 | |||
246 | |||
247 | |||
248 | push update all the remote branches matching the local ones. |
||
249 | |||
250 | |||
251 | |||
252 | |||
253 | based on a regular expression. see man gitrevisions |
||
254 | |||
255 | |||
256 | |||
257 | |||
258 | the git log output is the easiest option (especially if a pager with |
||
259 | search capabilities is used). |
||
260 | This commit can be checked out with |
||
261 | |||
262 | |||
263 | |||
264 | |||
265 | |||
266 | |||
267 | |||
268 | |||
269 | |||
270 | |||
271 | |||
272 | problems with the GIT server.> |
||
273 |