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