1 <?xml version="1.0" encoding="UTF-8"?>
\r
2 <!DOCTYPE sect2 SYSTEM "../../../dtd/dblite.dtd">
\r
3 <sect2 id="tsvn-dug-settings-main">
\r
4 <?dbhh topicname="HIDD_SETTINGSMAIN"?>
\r
5 <title>General Settings</title>
\r
7 <primary>sounds</primary>
\r
10 <figure id="tsvn-dug-settings-dia-main">
\r
11 <title>The Settings Dialog, General Page</title>
\r
12 <graphic fileref="../images/SettingsMain.png"/>
\r
14 This dialog allows you to specify your preferred language,
\r
15 and the Git-specific settings.
\r
19 <term>Language</term>
\r
22 Selects your user interface language.
\r
23 What else did you expect?
\r
28 <term>Automatically check for newer versions every week</term>
\r
31 If checked, TortoiseGit will contact its download site once a week
\r
32 to see if there is a newer version of the program available.
\r
33 Use <guibutton>Check now</guibutton> if you want an answer
\r
34 right away. The new version will not be downloaded; you
\r
35 simply receive an information dialog telling you that the
\r
36 new version is available.
\r
41 <term>System sounds</term>
\r
44 TortoiseGit has three custom sounds which are installed by default.
\r
62 You can select different sounds (or turn these sounds
\r
63 off completely) using the Windows Control Panel.
\r
64 <guibutton>Configure</guibutton> is a shortcut to the Control Panel.
\r
69 <term>Create Library</term>
\r
72 On Windows 7 you can create a Library in which to group working copies
\r
73 which are scattered in various places on your system.
\r
78 <term>Extern DLL Path</term>
\r
81 If your git installation needs an extra entry in the PATH environment variable,
\r
82 you can enter it here and it will get added to the PATH environment variable automatically when TortoiseGit starts.
\r
87 <sect3 id="tsvn-dug-settings-look-feel">
\r
88 <title>Context Menu Settings</title>
\r
89 <?dbhh topicname="HIDD_SETTINGSLOOKANDFEEL"?>
\r
91 <figure id="tsvn-dug-settings-dia-context">
\r
92 <title>The Settings Dialog, Context Menu Page</title>
\r
93 <graphic fileref="../images/SettingsContext.png"/>
\r
95 This page allows you to specify which of the TortoiseGit context menu
\r
96 entries will show up in the main context menu, and which will appear
\r
97 in the TortoiseGit submenu. By default most items are unchecked and
\r
98 appear in the submenu.
\r
101 Most of the time, you won't need the TortoiseGit context menu, apart
\r
102 for folders that are under version control by Git. For non-
\r
103 versioned folders, you only really need the context menu when you
\r
104 want to do a checkout. If you check the option <literal>Hide menus
\r
105 for unversioned paths</literal>, TortoiseGit will not add its entries
\r
106 to the context menu for unversioned folders. But the entries are
\r
107 added for all items and paths in a versioned folder. And you can
\r
108 get the entries back for unversioned folders by holding the
\r
109 <keycap>Shift</keycap> key down while showing the context menu.
\r
112 If there are some paths on your computer where you just don't want
\r
113 TortoiseGit's context menu to appear at all, you can list them in
\r
114 the box at the bottom.
\r
118 <sect3 id="tsvn-dug-settings-look-feel-extended">
\r
119 <title>Set Extend Menu Item</title>
\r
120 <?dbhh topicname="HIDD_SETTINGSEXTMENU"?>
\r
122 <figure id="tsvn-dug-settings-ext-menu">
\r
123 <title>The Settings Dialog, Set Extend Menu Item</title>
\r
124 <graphic fileref="../images/SettingsExtendMenu.png"/>
\r
126 This page allows you to specify which of the TortoiseGit context menu
\r
127 entries will show up in the extend context menu (press <keycap>Shift</keycap>
\r
128 key on <action>right click</action>),
\r
129 and which will appear in the normal context menu.
\r
130 This config will help reduce the context menu number at normal usage case
\r
131 according to your usage module.
\r
135 <sect3 id="tsvn-dug-settings-dialogs">
\r
136 <title>TortoiseGit Dialog Settings</title>
\r
137 <?dbhh topicname="HIDD_SETTINGSDIALOGS"?>
\r
139 <figure id="tsvn-dug-settings-dia-dialogs">
\r
140 <title>The Settings Dialog, Dialogs Page</title>
\r
141 <graphic fileref="../images/SettingsDialog.png"/>
\r
143 This dialog allows you to configure some of TortoiseGit's
\r
144 dialogs the way you like them.
\r
148 <term>Font for log messages</term>
\r
151 Selects the font face and size used to display the log
\r
152 message itself in the middle pane of the Revision Log
\r
153 dialog, and when composing log messages in the Commit
\r
159 <term>Short date / time format in log messages</term>
\r
162 If the standard long messages use up too much
\r
163 space on your screen use the short format.
\r
168 <term>apply --topo-order</term>
\r
171 Normally log entries/commits are ordered in descending order of the commit date.
\r
172 '--topo-order' makes the commits appear in topological order (i.e. descendant
\r
173 commits are shown before their parents). Not using this option, might break
\r
174 the graph in the log dialog. However, this option is slower, because all
\r
175 log entries have to be processed before displaying them.
\r
180 <term>Can double-click in log list to compare with previous revision</term>
\r
183 If you frequently find yourself comparing revisions in the top
\r
184 pane of the log dialog, you can use this option to allow that
\r
185 action on double-click. It is not enabled by default because
\r
186 fetching the diff is often a long process, and many people
\r
187 prefer to avoid the wait after an accidental double-click,
\r
188 which is why this option is not enabled by default.
\r
193 <term>Abbreviate renamings</term>
\r
196 Normally renamed files are listed as "long/path/for/file.txt (from long/path/to/file.txt)".
\r
197 If you check this option renamed files will be listed in a shorter format ("long/path/{to => for}/file.txt"),
\r
198 however, this abbreviated format might be harder to understand.
\r
203 <term>Symbolize ref names</term>
\r
206 Show symbols on ref labels to substitute part of the ref names.
\r
207 If this option is enabled, the following description and example will apply.
\r
208 If there is only a single remote, a lightning symbol will substitute the remote name part of each remote branch.
\r
209 If the remote branch is the upstream of a local branch, an up triangle symbol will substitute the branch name part of the remote branch.
\r
210 <figure id="tsvn-dug-settings-symbolizerefname-example">
\r
211 <title>Example of Symbolize ref names</title>
\r
212 <graphic fileref="../images/SymbolizeRefNamesExample.png"/>
\r
219 <term>Progress Dialog</term>
\r
222 TortoiseGit can automatically close all progress dialogs
\r
223 when the action is finished without error. This setting
\r
224 allows you to select the conditions for closing the
\r
225 dialogs. The default (recommended) setting is
\r
226 <guilabel>Close manually</guilabel>
\r
227 which allows you to review all messages and check what
\r
228 has happened. However, you may decide that you want to
\r
229 ignore some types of message and have the dialog
\r
230 close automatically if there are no critical changes.
\r
233 <guilabel>Auto-close if no merges, adds or deletes</guilabel>
\r
234 means that the progress dialog will close if there were
\r
235 simple updates, but if changes from the repository were
\r
236 merged with yours, or if any files were added or deleted,
\r
237 the dialog will remain open. It will also stay open if
\r
238 there were any conflicts or errors during the operation.
\r
241 <guilabel>Auto-close if no merges, adds or deletes for
\r
242 local operations</guilabel> means that the progress dialog
\r
243 will close as for <guilabel>Auto-close if no merges, adds
\r
244 or deletes</guilabel> but only for local operations like adding
\r
245 files or reverting changes. For remote operations the
\r
246 dialog will stay open.
\r
249 <guilabel>Auto-close if no conflicts</guilabel>
\r
250 relaxes the criteria further and will close the dialog
\r
251 even if there were merges, adds or deletes. However,
\r
252 if there were any conflicts or errors, the dialog
\r
256 <guilabel>Auto-close if no errors</guilabel>
\r
257 always closes the dialog even if there were conflicts.
\r
258 The only condition that keeps the dialog open is an
\r
259 error condition, which occurs when Git is unable
\r
260 to complete the task. For example, an update fails
\r
261 because the server is inaccessible, or a commit fails
\r
262 because the working tree is out-of-date.
\r
268 <term>Use recycle bin when reverting</term>
\r
271 When you revert local modifications, your changes are
\r
272 discarded. TortoiseGit gives you an extra safety net by
\r
273 sending the modified file to the recycle bin before
\r
274 bringing back the pristine copy. If you prefer to
\r
275 skip the recycle bin, uncheck this option.
\r
280 <term>Use auto-completion of file paths and keywords</term>
\r
283 The commit dialog includes a facility to parse the list
\r
284 of filenames being committed. When you type the first 3
\r
285 letters of an item in the list, the auto-completion
\r
286 box pops up, and you can press Enter to complete the
\r
287 filename. Check the box to enable this feature.
\r
292 <term>Timeout in seconds to stop the auto-completion parsing</term>
\r
295 The auto-completion parser can be quite slow if there are a lot
\r
296 of large files to check. This timeout stops the commit dialog
\r
297 being held up for too long. If you are missing important
\r
298 auto-completion information, you can extend the timeout.
\r
303 <term>Max. items to keep in the log message history</term>
\r
306 When you type in a log message in the commit dialog, TortoiseGit
\r
307 stores it for possible re-use later. By default it will keep the
\r
308 last 25 log messages for each repository, but you can customize
\r
310 If you have many different repositories, you may wish to
\r
311 reduce this to avoid filling your registry.
\r
314 Note that this setting applies only to messages that you type
\r
315 in on this computer. It has nothing to do with the log cache.
\r
320 <term>Select items automatically</term>
\r
323 The normal behaviour in the commit dialog is for all modified
\r
324 (versioned) items to be selected for commit automatically.
\r
325 If you prefer to start with nothing selected and pick the
\r
326 items for commit manually, uncheck this box.
\r
332 <sect3 id="tsvn-dug-settings-colours">
\r
333 <title>TortoiseGit Colour Settings</title>
\r
334 <?dbhh topicname="HIDD_SETTINGSCOLORS_1"?>
\r
336 <figure id="tsvn-dug-settings-dia-colors">
\r
337 <title>The Settings Dialog, Colours Page</title>
\r
338 <graphic fileref="../images/SettingsColors.png"/>
\r
340 This dialog allows you to configure the text colours
\r
341 used in TortoiseGit's dialogs the way you like them.
\r
345 <term>Possible or real conflict / obstructed</term>
\r
348 A conflict has occurred during update, or may occur during merge.
\r
349 Update is obstructed by an existing unversioned file/folder of
\r
350 the same name as a versioned one.
\r
353 This colour is also used for error messages in the progress dialogs.
\r
358 <term>Added files</term>
\r
361 Items added to the repository.
\r
366 <term>Missing / deleted / replaced</term>
\r
369 Items deleted from the repository, missing from the working
\r
370 copy, or deleted from the working tree and replaced with
\r
371 another file of the same name.
\r
376 <term>Merged</term>
\r
379 Changes from the repository successfully merged into the working tree
\r
380 without creating any conflicts.
\r
385 <term>Modified / copied</term>
\r
388 Add with history, or paths copied in the repository.
\r
389 Also used in the log dialog for entries which include
\r
395 <term>Deleted node</term>
\r
398 An item which has been deleted from the repository.
\r
403 <term>Added node</term>
\r
406 An item which has been added to the repository, by an add, copy
\r
412 <term>Renamed node</term>
\r
415 An item which has been renamed within the repository.
\r
420 <term>Replaced node</term>
\r
423 The original item has been deleted and a new item with
\r
424 the same name replaces it.
\r
430 <sect3 id="tsvn-dug-settings-colours2">
\r
431 <title>TortoiseGit Colour Settings 2</title>
\r
432 <?dbhh topicname="HIDD_SETTINGSCOLORS_2"?>
\r
434 <figure id="tsvn-dug-settings-dia-colors2">
\r
435 <title>The Settings Dialog, Colours Page</title>
\r
436 <graphic fileref="../images/SettingsColors2.png"/>
\r
438 This dialog allows you to configure the text colours
\r
439 used in TortoiseGit's dialogs the way you like them.
\r
442 <sect3 id="tsvn-dug-settings-colours3">
\r
443 <title>TortoiseGit Colour Settings 3</title>
\r
444 <?dbhh topicname="HIDD_SETTINGSCOLORS_3"?>
\r
446 <figure id="tsvn-dug-settings-dia-colors-3">
\r
447 <title>The Settings Dialog, Colours Page</title>
\r
448 <graphic fileref="../images/SettingsColors3.png"/>
\r
450 This dialog allows you to configure the line colours
\r
451 in the graph column used in TortoiseGit's log dialog the way you like them.
\r