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>Global ignore pattern</term>
\r
72 <primary>exclude pattern</primary>
\r
75 <primary>global ignore</primary>
\r
78 Global ignore patterns are used to prevent unversioned files from
\r
79 showing up e.g. in the commit dialog. Files matching the
\r
80 patterns are also ignored by an import.
\r
81 Ignore files or directories by typing in the names or extensions.
\r
82 Patterns are separated by spaces e.g.
\r
83 <literal>bin obj *.bak *.~?? *.jar *.[Tt]mp</literal>.
\r
84 These patterns should not include any path separators. Note also
\r
85 that there is no way to differentiate between files and directories.
\r
86 Read <xref linkend="tsvn-dug-ignore-glob"/> for more information
\r
87 on the pattern-matching syntax.
\r
90 Note that the ignore patterns you specify here will also
\r
91 affect other Git clients running on your PC, including
\r
92 the command line client.
\r
96 If you use the Git configuration file to set
\r
97 a <literal>global-ignores</literal> pattern, it will
\r
98 override the settings you make here. The Git
\r
99 configuration file is accessed using the
\r
100 <guibutton>Edit</guibutton> as described below.
\r
104 This ignore pattern will affect all your projects.
\r
105 It is not versioned, so it will not affect other users.
\r
106 By contrast you can also use the versioned
\r
107 <literal>svn:ignore</literal> property to exclude
\r
108 files or directories from version control. Read
\r
109 <xref linkend="tsvn-dug-ignore"/>
\r
110 for more information.
\r
115 <term>Set file dates to the <quote>last commit time</quote></term>
\r
118 This option tells TortoiseGit to set the file dates to
\r
119 the last commit time when doing a checkout or an update.
\r
120 Otherwise TortoiseGit will use the current date.
\r
121 If you are developing software it is generally best
\r
122 to use the current date because build systems normally
\r
123 look at the date stamps to decide which files need
\r
124 compiling. If you use <quote>last commit time</quote> and revert
\r
125 to an older file revision, your project may not compile
\r
126 as you expect it to.
\r
131 <term>Git configuration file</term>
\r
134 Use <guibutton>Edit</guibutton> to edit the
\r
135 Git configuration file directly.
\r
136 Some settings cannot be modified directly by
\r
137 TortoiseGit, and need to be set here instead.
\r
138 For more information about the Git
\r
139 <filename>config</filename> file see the
\r
140 <ulink url="http://svnbook.red-bean.com/en/1.5/svn.advanced.confarea.html">
\r
141 <citetitle>Runtime Configuration Area</citetitle>
\r
144 <ulink url="http://svnbook.red-bean.com/en/1.5/svn.advanced.props.html#svn.advanced.props.auto">
\r
145 <citetitle>Automatic Property Setting</citetitle>
\r
147 is of particular interest, and that is configured here.
\r
148 Note that Git can read configuration information
\r
149 from several places, and you need to know which one
\r
150 takes priority. Refer to
\r
151 <ulink url="http://svnbook.red-bean.com/en/1.5/svn.advanced.confarea.html#svn.advanced.confarea.windows-registry">
\r
152 <citetitle>Configuration and the Windows Registry</citetitle>
\r
153 </ulink> to find out more.
\r
158 <term>Use <filename>_svn</filename> instead of <filename>.svn</filename> directories</term>
\r
161 VS.NET when used with web projects can't handle the <literal>.svn</literal>
\r
162 folders that Git uses to store its internal information.
\r
163 This is not a bug in Git. The bug is in VS.NET and the frontpage
\r
164 extensions it uses. Read <xref linkend="tsvn-dug-settings-asp-dot-net"/>
\r
165 to find out more about this issue.
\r
168 If you want to change the behaviour of Git and TortoiseGit,
\r
169 you can use this checkbox to set the environment variable which
\r
173 You should note that changing this option will not automatically
\r
174 convert existing working copies to use the new admin directory.
\r
175 You will have to do that yourself using a script (See our FAQ)
\r
176 or simply check out a fresh working copy.
\r
181 <sect3 id="tsvn-dug-settings-look-feel">
\r
182 <title>Context Menu Settings</title>
\r
183 <?dbhh topicname="HIDD_SETTINGSLOOKANDFEEL"?>
\r
185 <figure id="tsvn-dug-settings-dia-context">
\r
186 <title>The Settings Dialog, Context Menu Page</title>
\r
187 <graphic fileref="../images/SettingsContext.png"/>
\r
189 This page allows you to specify which of the TortoiseGit context menu
\r
190 entries will show up in the main context menu, and which will appear
\r
191 in the TortoiseGit submenu. By default most items are unchecked and
\r
192 appear in the submenu.
\r
195 There is a special case for <guilabel>Get Lock</guilabel>. You can of
\r
196 course promote it to the top level using the list above, but as most
\r
197 files don't need locking this just adds clutter. However, a file with
\r
198 the <literal>svn:needs-lock</literal> property needs this action every
\r
199 time it is edited, so in that case it is very useful to have at the top
\r
200 level. Checking the box here means that when a file is selected which has
\r
201 the <literal>svn:needs-lock</literal> property set,
\r
202 <guilabel>Get Lock</guilabel> will always appear at the top level.
\r
205 If there are some paths on your computer where you just don't want
\r
206 TortoiseGit's context menu to appear at all, you can list them in
\r
207 the box at the bottom.
\r
210 <sect3 id="tsvn-dug-settings-dialogs">
\r
211 <title>TortoiseGit Dialog Settings 1</title>
\r
212 <?dbhh topicname="HIDD_SETTINGSDIALOGS"?>
\r
214 <figure id="tsvn-dug-settings-dia-dialogs">
\r
215 <title>The Settings Dialog, Dialogs 1 Page</title>
\r
216 <graphic fileref="../images/SettingsDialog.png"/>
\r
218 This dialog allows you to configure some of TortoiseGit's
\r
219 dialogs the way you like them.
\r
223 <term>Default number of log messages</term>
\r
226 Limits the number of log messages that TortoiseGit
\r
227 fetches when you first select
\r
229 <guimenu>TortoiseGit</guimenu>
\r
230 <guimenuitem>Show Log</guimenuitem>
\r
232 Useful for slow server connections. You can always use
\r
233 <guibutton>Show All</guibutton> or
\r
234 <guibutton>Next 100</guibutton> to get more messages.
\r
239 <term>Font for log messages</term>
\r
242 Selects the font face and size used to display the log
\r
243 message itself in the middle pane of the Revision Log
\r
244 dialog, and when composing log messages in the Commit
\r
250 <term>Short date / time format in log messages</term>
\r
253 If the standard long messages use up too much
\r
254 space on your screen use the short format.
\r
259 <term>Can double-click in log list to compare with previous revision</term>
\r
262 If you frequently find yourself comparing revisions in the top
\r
263 pane of the log dialog, you can use this option to allow that
\r
264 action on double-click. It is not enabled by default because
\r
265 fetching the diff is often a long process, and many people
\r
266 prefer to avoid the wait after an accidental double-click,
\r
267 which is why this option is not enabled by default.
\r
272 <term>Progress Dialog</term>
\r
275 TortoiseGit can automatically close all progress dialogs
\r
276 when the action is finished without error. This setting
\r
277 allows you to select the conditions for closing the
\r
278 dialogs. The default (recommended) setting is
\r
279 <guilabel>Close manually</guilabel>
\r
280 which allows you to review all messages and check what
\r
281 has happened. However, you may decide that you want to
\r
282 ignore some types of message and have the dialog
\r
283 close automatically if there are no critical changes.
\r
286 <guilabel>Auto-close if no merges, adds or deletes</guilabel>
\r
287 means that the progress dialog will close if there were
\r
288 simple updates, but if changes from the repository were
\r
289 merged with yours, or if any files were added or deleted,
\r
290 the dialog will remain open. It will also stay open if
\r
291 there were any conflicts or errors during the operation.
\r
294 <guilabel>Auto-close if no merges, adds or deletes for
\r
295 local operations</guilabel> means that the progress dialog
\r
296 will close as for <guilabel>Auto-close if no merges, adds
\r
297 or deletes</guilabel> but only for local operations like adding
\r
298 files or reverting changes. For remote operations the
\r
299 dialog will stay open.
\r
302 <guilabel>Auto-close if no conflicts</guilabel>
\r
303 relaxes the criteria further and will close the dialog
\r
304 even if there were merges, adds or deletes. However,
\r
305 if there were any conflicts or errors, the dialog
\r
309 <guilabel>Auto-close if no errors</guilabel>
\r
310 always closes the dialog even if there were conflicts.
\r
311 The only condition that keeps the dialog open is an
\r
312 error condition, which occurs when Git is unable
\r
313 to complete the task. For example, an update fails
\r
314 because the server is inaccessible, or a commit fails
\r
315 because the working copy is out-of-date.
\r
320 <term>Use recycle bin when reverting</term>
\r
323 When you revert local modifications, your changes are
\r
324 discarded. TortoiseGit gives you an extra safety net by
\r
325 sending the modified file to the recycle bin before
\r
326 bringing back the pristine copy. If you prefer to
\r
327 skip the recycle bin, uncheck this option.
\r
332 <term>Use URL of WC as the default <quote>From:</quote> URL</term>
\r
335 In the merge dialog, the default behaviour is for the
\r
336 <guilabel>From:</guilabel> URL to be remembered between
\r
337 merges. However, some people like to perform merges from
\r
338 many different points in their hierarchy, and find it easier
\r
339 to start out with the URL of the current working copy.
\r
340 This can then be edited to refer to a parallel path on
\r
346 <term>Default checkout path</term>
\r
349 You can specify the default path for checkouts. If you keep all
\r
350 your checkouts in one place, it is useful to have the drive
\r
351 and folder pre-filled so you only have to add the new folder name
\r
357 <term>Default checkout URL</term>
\r
360 You can also specify the default URL for checkouts. If you often
\r
361 checkout sub-projects of some very large project, it can be useful
\r
362 to have the URL pre-filled so you only have to add the sub-project
\r
369 <sect3 id="tsvn-dug-settings-dialogs-2">
\r
370 <title>TortoiseGit Dialog Settings 2</title>
\r
371 <?dbhh topicname="HIDD_SETTINGSMISC"?>
\r
373 <figure id="tsvn-dug-settings-dia-dialogs-2">
\r
374 <title>The Settings Dialog, Dialogs 2 Page</title>
\r
375 <graphic fileref="../images/SettingsDialog2.png"/>
\r
380 <term>Recurse into unversioned folders</term>
\r
383 If this box is checked (default state), then whenever
\r
384 the status of an unversioned folder is shown in the
\r
385 <guilabel>Add</guilabel>,
\r
386 <guilabel>Commit</guilabel> or
\r
387 <guilabel>Check for Modifications</guilabel> dialog,
\r
388 every child file and folder is also shown.
\r
389 If you uncheck this box, only the unversioned parent is shown.
\r
390 Unchecking reduces clutter in these dialogs. In that case if you
\r
391 select an unversioned folder for Add, it is added recursively.
\r
396 <term>Use auto-completion of file paths and keywords</term>
\r
399 The commit dialog includes a facility to parse the list
\r
400 of filenames being committed. When you type the first 3
\r
401 letters of an item in the list, the auto-completion
\r
402 box pops up, and you can press Enter to complete the
\r
403 filename. Check the box to enable this feature.
\r
408 <term>Timeout in seconds to stop the auto-completion parsing</term>
\r
411 The auto-completion parser can be quite slow if there are a lot
\r
412 of large files to check. This timeout stops the commit dialog
\r
413 being held up for too long. If you are missing important
\r
414 auto-completion information, you can extend the timeout.
\r
419 <term>Only use spellchecker when <literal>tsvn:projectlanguage</literal> is set</term>
\r
422 If you don't wish to use the spellchecker for all commits,
\r
423 check this box. The spellchecker will still be enabled where
\r
424 the project properties require it.
\r
429 <term>Max. items to keep in the log message history</term>
\r
432 When you type in a log message in the commit dialog, TortoiseGit
\r
433 stores it for possible re-use later. By default it will keep the
\r
434 last 25 log messages for each repository, but you can customize
\r
436 If you have many different repositories, you may wish to
\r
437 reduce this to avoid filling your registry.
\r
440 Note that this setting applies only to messages that you type
\r
441 in on this computer. It has nothing to do with the log cache.
\r
446 <term>Re-open commit and branch/tag dialog after a commit failed</term>
\r
449 When a commit fails for some reason (working copy needs updating,
\r
450 pre-commit hook rejects commit, network error, etc), you can select
\r
451 this option to keep the commit dialog open ready to try again.
\r
452 However, you should be aware that this can lead to problems.
\r
453 If the failure means you need to update your working copy, and
\r
454 that update leads to conflicts you must resolve those first.
\r
459 <term>Select items automatically</term>
\r
462 The normal behaviour in the commit dialog is for all modified
\r
463 (versioned) items to be selected for commit automatically.
\r
464 If you prefer to start with nothing selected and pick the
\r
465 items for commit manually, uncheck this box.
\r
470 <term>Contact the repository on startup</term>
\r
473 The Check for Modifications dialog checks the working copy
\r
474 by default, and only contacts the repository when you click
\r
475 <guibutton>Check repository</guibutton>. If you always want
\r
476 to check the repository, you can use this setting to make that
\r
477 action happen automatically.
\r
482 <term>Show Lock dialog before locking files</term>
\r
485 When you select one or more files and then use
\r
487 <guimenu>TortoiseGit</guimenu>
\r
488 <guimenuitem>Lock</guimenuitem>
\r
490 to take out a lock on those files, on some projects it is
\r
491 customary to write a lock message explaining why you have
\r
492 locked the files. If you do not use lock messages, you can
\r
493 uncheck this box to skip that dialog and lock the files
\r
497 If you use the lock command on a folder, you are always
\r
498 presented with the lock dialog as that also gives you the
\r
499 option to select files for locking.
\r
502 If your project is using the <literal>tsvn:lockmsgminsize</literal>
\r
503 property, you will see the lock dialog regardless of this setting
\r
504 because the project <emphasis>requires</emphasis> lock messages.
\r
510 <sect3 id="tsvn-dug-settings-colours">
\r
511 <title>TortoiseGit Colour Settings</title>
\r
512 <?dbhh topicname="HIDD_SETTINGSCOLORS_1"?>
\r
514 <figure id="tsvn-dug-settings-dia-colors">
\r
515 <title>The Settings Dialog, Colours Page</title>
\r
516 <graphic fileref="../images/SettingsColors.png"/>
\r
518 This dialog allows you to configure the text colours
\r
519 used in TortoiseGit's dialogs the way you like them.
\r
523 <term>Possible or real conflict / obstructed</term>
\r
526 A conflict has occurred during update, or may occur during merge.
\r
527 Update is obstructed by an existing unversioned file/folder of
\r
528 the same name as a versioned one.
\r
531 This colour is also used for error messages in the progress dialogs.
\r
536 <term>Added files</term>
\r
539 Items added to the repository.
\r
544 <term>Missing / deleted / replaced</term>
\r
547 Items deleted from the repository, missing from the working
\r
548 copy, or deleted from the working copy and replaced with
\r
549 another file of the same name.
\r
554 <term>Merged</term>
\r
557 Changes from the repository successfully merged into the WC
\r
558 without creating any conflicts.
\r
563 <term>Modified / copied</term>
\r
566 Add with history, or paths copied in the repository.
\r
567 Also used in the log dialog for entries which include
\r
573 <term>Deleted node</term>
\r
576 An item which has been deleted from the repository.
\r
581 <term>Added node</term>
\r
584 An item which has been added to the repository, by an add, copy
\r
590 <term>Renamed node</term>
\r
593 An item which has been renamed within the repository.
\r
598 <term>Replaced node</term>
\r
601 The original item has been deleted and a new item with
\r
602 the same name replaces it.
\r
608 <sect3 id="tsvn-dug-settings-colours2">
\r
609 <title>TortoiseGit Colour Settings 2</title>
\r
610 <?dbhh topicname="HIDD_SETTINGSCOLORS_2"?>
\r
612 <figure id="tsvn-dug-settings-dia-colors2">
\r
613 <title>The Settings Dialog, Colours Page</title>
\r
614 <graphic fileref="../images/SettingsColors2.png"/>
\r
616 This dialog allows you to configure the text colours
\r
617 used in TortoiseGit's dialogs the way you like them.
\r
620 <sect3 id="tsvn-dug-settings-colours3">
\r
621 <title>TortoiseGit Colour Settings 3</title>
\r
622 <?dbhh topicname="HIDD_SETTINGSCOLORS_3"?>
\r
624 <figure id="tsvn-dug-settings-dia-colors-3">
\r
625 <title>The Settings Dialog, Colours Page</title>
\r
626 <graphic fileref="../images/SettingsColors3.png"/>
\r
628 This dialog allows you to configure the text colours
\r
629 used in TortoiseGit's dialogs the way you like them.
\r