| blob | 3037f5d94eee0d54e237b279a01a885539c93493 |
1 <?xml version="1.0" encoding="UTF-8"?>\r
2 <!DOCTYPE glossary SYSTEM "../dtd/dblite.dtd">\r
3 <!--\r
4 Enter Glossary definitions in alphabetical Order!\r
5 DocBook doesn't sort them automatically.\r
6 -->\r
7 <glossary id="tgit-glossary">\r
8 <title>Glossary</title>\r
9 <glossentry>\r
10 <glossterm>Add</glossterm>\r
11 <glossdef>\r
12 <para>\r
13 A Git command that is used to add a\r
14 file to your working tree.\r
15 The new items are added to the repository when you commit.\r
16 </para>\r
17 </glossdef>\r
18 </glossentry>\r
19 <glossentry>\r
20 <glossterm>BASE revision</glossterm>\r
21 <glossdef>\r
22 <para>\r
23 This is the common ancestor's version of a conflicted file.\r
24 </para>\r
25 </glossdef>\r
26 </glossentry>\r
27 <glossentry>\r
28 <glossterm>Blame</glossterm>\r
29 <glossdef>\r
30 <para>\r
31 This command is for text files only, and it annotates every line to\r
32 show the repository revision in which it was last changed, and the\r
33 author who made that change. Our GUI implementation is called\r
34 TortoiseGitBlame and it also shows the commit date/time and the\r
35 log message when you hover the mouse of the revision number.\r
36 </para>\r
37 </glossdef>\r
38 </glossentry>\r
39 <glossentry>\r
40 <glossterm>Branch</glossterm>\r
41 <glossdef>\r
42 <para>\r
43 A term frequently used in revision control systems to describe\r
44 what happens when development forks at a particular point and\r
45 follows 2 separate paths. You can create a branch off the main\r
46 development line so as to develop a new feature without rendering\r
47 the main line unstable. Or you can branch a stable release to which\r
48 you make only bug fixes, while new developments take place on the\r
49 unstable trunk. In Git a branch is implemented as a\r
50 <quote>pointer to a revision</quote>.\r
51 </para>\r
52 </glossdef>\r
53 </glossentry>\r
54 <glossentry>\r
55 <glossterm>Clone</glossterm>\r
56 <glossdef>\r
57 <para>\r
58 A Git command which creates a local working tree in an empty\r
59 directory by downloading a remote repository.\r
60 </para>\r
61 </glossdef>\r
62 </glossentry>\r
63 <glossentry>\r
64 <glossterm>Cleanup</glossterm>\r
65 <glossdef>\r
66 <para>\r
67 Remove untracked files from the working tree.\r
68 </para>\r
69 <para>\r
70 <emphasis>This is different to TortoiseSVN cleanup</emphasis>\r
71 </para>\r
72 </glossdef>\r
73 </glossentry>\r
74 <glossentry>\r
75 <glossterm>Commit</glossterm>\r
76 <glossdef>\r
77 <para>\r
78 This Git command is used to pass the changes in your local\r
79 working tree back into the repository, creating a new repository\r
80 revision.\r
81 </para>\r
82 </glossdef>\r
83 </glossentry>\r
84 <glossentry>\r
85 <glossterm>Conflict</glossterm>\r
86 <glossdef>\r
87 <para>\r
88 When changes from the repository are merged with local changes,\r
89 sometimes those changes occur on the same lines. In this case\r
90 Git cannot automatically decide which version to use and\r
91 the file is said to be in conflict. You have to edit the file manually\r
92 and resolve the conflict before you can commit any further changes.\r
93 </para>\r
94 </glossdef>\r
95 </glossentry>\r
96 <glossentry>\r
97 <glossterm>Copy</glossterm>\r
98 <glossdef>\r
99 <para>\r
100 In a Git repository you can manually create a copy of a single file\r
101 or an entire tree w/o problems.\r
102 </para>\r
103 </glossdef>\r
104 </glossentry>\r
105 <glossentry>\r
106 <glossterm>Delete</glossterm>\r
107 <glossdef>\r
108 <para>\r
109 When you delete a versioned item (and commit the change) the item\r
110 no longer exists in the repository after the committed revision.\r
111 But of course it still exists in earlier repository revisions,\r
112 so you can still access it. If necessary, you can copy a deleted\r
113 item and <quote>resurrect</quote> it complete with history.\r
114 </para>\r
115 </glossdef>\r
116 </glossentry>\r
117 <glossentry>\r
118 <glossterm>Diff</glossterm>\r
119 <glossdef>\r
120 <para>\r
121 Shorthand for <quote>Show Differences</quote>. Very useful when\r
122 you want to see exactly what changes have been made.\r
123 </para>\r
124 </glossdef>\r
125 </glossentry>\r
126 <glossentry>\r
127 <glossterm>Export</glossterm>\r
128 <glossdef>\r
129 <para>\r
130 This command produces an compressed archive of all versioned files (of a specific revision).\r
131 </para>\r
132 </glossdef>\r
133 </glossentry>\r
134 <glossentry>\r
135 <glossterm>GPO</glossterm>\r
136 <glossdef>\r
137 <para>\r
138 Group policy object\r
139 </para>\r
140 </glossdef>\r
141 </glossentry>\r
142 <glossentry>\r
143 <glossterm>HEAD</glossterm>\r
144 <glossdef>\r
145 <para>\r
146 HEAD is a synonym for the currently active branch (to be more precise in Git HEAD can also be so-called "detached" and directly pointing to a commit instead of a branch).\r
147 </para>\r
148 </glossdef>\r
149 </glossentry>\r
150 <glossentry>\r
151 <glossterm>History</glossterm>\r
152 <glossdef>\r
153 <para>\r
154 Show the revision history of a file or folder.\r
155 Also known as <quote>Log</quote>.\r
156 </para>\r
157 </glossdef>\r
158 </glossentry>\r
159 <glossentry>\r
160 <glossterm>Log</glossterm>\r
161 <glossdef>\r
162 <para>\r
163 Show the revision history of a file or folder.\r
164 Also known as <quote>History</quote>.\r
165 </para>\r
166 </glossdef>\r
167 </glossentry>\r
168 <glossentry>\r
169 <glossterm>Merge</glossterm>\r
170 <glossdef>\r
171 <para>\r
172 The process by which changes from the repository are added to your\r
173 working tree without disrupting any changes you have already made\r
174 locally. Sometimes these changes cannot be reconciled automatically\r
175 and the working tree is said to be in conflict.\r
176 </para>\r
177 <para>\r
178 Merging happens automatically when you pull changes, cherry-pick, or rebase.\r
179 You can also merge specific changes from another branch using\r
180 TortoiseGit's Merge command.\r
181 </para>\r
182 </glossdef>\r
183 </glossentry>\r
184 <glossentry>\r
185 <glossterm>Patch</glossterm>\r
186 <glossdef>\r
187 <para>\r
188 If a working tree has changes to text files only, it is possible\r
189 to use Git's Diff command to generate a single file summary\r
190 of those changes in Unified Diff format. A file of this type is often\r
191 referred to as a <quote>Patch</quote>, and it can be emailed to someone\r
192 else (or to a mailing list) and applied to another working tree.\r
193 Someone without commit access can make changes and submit a patch\r
194 file for an authorized committer to apply. Or if you are unsure about\r
195 a change you can submit a patch for others to review.\r
196 </para>\r
197 </glossdef>\r
198 </glossentry>\r
199 <glossentry>\r
200 <glossterm>Pull</glossterm>\r
201 <glossdef>\r
202 <para>\r
203 This Git command pulls down the latest changes from the\r
204 repository into your working tree, merging any changes made by\r
205 others with local changes in the working tree.\r
206 </para>\r
207 </glossdef>\r
208 </glossentry>\r
209 <glossentry>\r
210 <glossterm>Repository</glossterm>\r
211 <glossdef>\r
212 <para>\r
213 A repository is a place where data is stored and maintained.\r
214 A repository can be a place where multiple databases or files are located for\r
215 distribution over a network, or a repository can be a location that is\r
216 directly accessible to the user without having to travel across a network.\r
217 Git is a distributed version control system - each working tree contains its own repository (in the <filename>.git</filename> folder).\r
218 A Git repository does not require network to work with most operations.\r
219 Network is required only when you need to synchronize changes with remote repositories.\r
220 </para>\r
221 </glossdef>\r
222 </glossentry>\r
223 <glossentry>\r
224 <glossterm>Resolve</glossterm>\r
225 <glossdef>\r
226 <para>\r
227 When files in a working tree are left in a conflicted state following\r
228 a merge, those conflicts must be sorted out by a human using an editor\r
229 (or perhaps TortoiseGitMerge). This process is referred to as\r
230 <quote>Resolving Conflicts</quote>. When this is complete you can mark\r
231 the conflicted files as being resolved, which allows them to be committed.\r
232 </para>\r
233 </glossdef>\r
234 </glossentry>\r
235 <glossentry>\r
236 <glossterm>Revert</glossterm>\r
237 <glossdef>\r
238 <para>\r
239 If you have made changes\r
240 and decide you want to undo them, you can use the <quote>revert</quote>\r
241 command to go back to the version from HEAD.\r
242 </para>\r
243 </glossdef>\r
244 </glossentry>\r
245 <glossentry>\r
246 <glossterm>Revision</glossterm>\r
247 <glossdef>\r
248 <para>\r
249 Every time you commit a set of changes, you create one new\r
250 <quote>revision</quote> in the repository. Each revision represents\r
251 the state of the repository tree at a certain point in its history.\r
252 If you want to go back in time you can examine the repository as\r
253 it was at a specific revision.\r
254 </para>\r
255 <para>\r
256 In another sense, a revision can refer to the set of changes that\r
257 were made when that revision was created.\r
258 </para>\r
259 </glossdef>\r
260 </glossentry>\r
261 <glossentry>\r
262 <glossterm>SVN</glossterm>\r
263 <glossdef>\r
264 <para>\r
265 A frequently-used abbreviation for Subversion.\r
266 </para>\r
267 <para>\r
268 TortoiseGit provides git-svn interoperability.\r
269 You can fetch partial or whole history from an SVN remote and store as a local git repository.\r
270 This allows you to browse the history and create commits locally.\r
271 You can finally commit your changes to an SVN remote.\r
272 </para>\r
273 </glossdef>\r
274 </glossentry>\r
275 <glossentry>\r
276 <glossterm>Switch/Checkout</glossterm>\r
277 <glossdef>\r
278 <para>\r
279 Updates all files in the working tree to a specific version. This is normally used for switching/checking out branches.\r
280 </para>\r
281 </glossdef>\r
282 </glossentry>\r
283 <glossentry>\r
284 <glossterm>Update</glossterm>\r
285 <glossdef>\r
286 <para>\r
287 The corresponding command for the SVN update command is <emphasis>Pull</emphasis>.\r
288 </para>\r
289 </glossdef>\r
290 </glossentry>\r
291 <glossentry>\r
292 <glossterm>Working Copy</glossterm>\r
293 <glossdef>\r
294 <para>\r
295 See <quote>Working Tree</quote>.\r
296 </para>\r
297 </glossdef>\r
298 </glossentry>\r
299 <glossentry>\r
300 <glossterm>Working Tree</glossterm>\r
301 <glossdef>\r
302 <para>\r
303 This is your local <quote>sandbox</quote>, the area where you\r
304 work on the versioned files, and it normally resides on your\r
305 local hard disk. You create a working tree by doing a\r
306 <quote>Clone</quote> of a repository, and you feed your\r
307 changes back into the repository using <quote>Commit</quote>.\r
308 </para>\r
309 </glossdef>\r
310 </glossentry>\r
311 </glossary>\r
312 <!--\r
313 local variables:\r
314 sgml-parent-document: ("book.xml" "glossary")\r
315 end:\r
316 -->\r