user/sven/git.git/lib/option.tcl, branch gitgui-0.18.0

git-gui: make config gui.warndetachedcommit a boolean

2011-11-05T00:39:03Z

Signed-off-by: Bert Wesarg Signed-off-by: Pat Thoyts

git-gui: add config value gui.diffopts for passing additional diff options

2011-11-05T00:38:01Z

Signed-off-by: Tilman Vogel Signed-off-by: Pat Thoyts

git-gui: new config to control staging of untracked files

2011-10-18T08:44:10Z

The default is the current "ask". Signed-off-by: Bert Wesarg Signed-off-by: Pat Thoyts

git-gui: use textconv filter for diff and blame

2010-07-30T09:05:27Z

Create a checkbox "Use Textconv For Diffs and Blame" in git-gui options. If checked and if the driver for the concerned file exists, git-gui calls diff and blame with --textconv option Signed-off-by: Clément Poulain Signed-off-by: Diane Gasselin Signed-off-by: Axel Bonnet Signed-off-by: Matthieu Moy Signed-off-by: Pat Thoyts

git-gui: use themed tk widgets with Tk 8.5

2010-01-28T01:13:52Z

This patch enables the use of themed Tk widgets with Tk 8.5 and above. These make a significant difference on Windows in making the application appear native. On Windows and MacOSX ttk defaults to the native look as much as possible. On X11 the user may select a theme using the TkTheme XRDB resource class by adding an line to the .Xresources file. The set of installed theme names is available using the Tk command 'ttk::themes'. The default on X11 is similar to the current un-themed style - a kind of thin bordered motif look. A new git config variable 'gui.usettk' may be set to disable this if the user prefers the classic Tk look. Using Tk 8.4 will also avoid the use of themed widgets as these are only available since 8.5. Some support is included for Tk 8.6 features (themed spinbox and native font chooser for MacOSX and Windows). Signed-off-by: Pat Thoyts Signed-off-by: Shawn O. Pearce

git-gui: Implement system-wide configuration handling.

2008-11-16T21:33:09Z

With the old implementation any system-wide options appear to be set locally in the current repository. This commit adds explicit handling of system options, essentially interpreting them as customized default_config. The difficulty in interpreting system options stems from the fact that simple 'git config' lists all values, while 'git config --global' only values set in ~/.gitconfig, excluding both local and system options. Signed-off-by: Alexander Gavrilov Signed-off-by: Shawn O. Pearce

git-gui: Add a menu of available encodings.

2008-09-24T19:48:32Z

To make encoding selection easier, add a menu that lists available encodings to the Options window. Menu structure is borrowed from Firefox. Signed-off-by: Alexander Gavrilov Tested-by: Johannes Sixt Signed-off-by: Shawn O. Pearce

git-gui: Cleanup handling of the default encoding.

2008-09-24T19:48:32Z

- Make diffs and blame default to the system (locale) encoding instead of hard-coding UTF-8. - Add a gui.encoding option to allow overriding it. - gitattributes still have the final word. The rationale for this is Windows support: 1) Windows people are accustomed to using legacy encodings for text files. For many of them defaulting to utf-8 will be counter-intuitive. 2) Windows doesn't support utf-8 locales, and switching the system encoding is a real pain. Thus the option. This patch also adds proper encoding conversion to Apply Hunk/Line. Signed-off-by: Alexander Gavrilov Tested-by: Johannes Sixt Signed-off-by: Shawn O. Pearce

git-gui: Support calling merge tools.

2008-09-05T04:28:54Z

Adds an item to the diff context menu in conflict mode, which invokes a merge tool for the selected file. Tool command-line handling code was ported from git-mergetool. Automatic default tool selection and custom merge tools are not supported. If merge.tool is not set, git-gui defaults to meld. This implementation uses a checkout-index hack in order to retrieve all stages with autocrlf and filters properly applied. It requires temporarily moving the original conflict file out of the way. Signed-off-by: Alexander Gavrilov Signed-off-by: Shawn O. Pearce

Merge branch 'maint'

2008-09-01T22:39:56Z

* maint: git-gui: Fix string escaping in po2msg.sh git gui: show diffs with a minimum of 1 context line Conflicts: lib/option.tcl