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

git-gui: include the number of untracked files to stage when asking the user

2011-10-18T08:44:10Z

Signed-off-by: Bert Wesarg 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 "untracked" for files which are not known to git

2011-10-18T08:44:10Z

"untracked" is the right phrase for files new to git. For example git-status uses this phrase. Also make the question shorter. Signed-off-by: Bert Wesarg Signed-off-by: Pat Thoyts

git-gui: fix unintended line break in message string

2011-10-18T08:44:10Z

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

git-gui: deal with unknown files when pressing the "Stage Changed" button

2011-10-06T22:20:16Z

As a shortcut the "Stage Changed" button can be used to stage all current changes in the worktree which are not set to ignore. Previously unknown files would be ignored. The user might want to say: "Just save everything in my worktree". To support this workflow we now ask whether the user also wants to stage the unknown files if there are some present. Signed-off-by: Heiko Voigt Signed-off-by: Pat Thoyts

git-gui: learn more type change states

2011-01-28T00:16:50Z

Support the following states with type change in git-gui: AT, MT, TD, TM Signed-off-by: Bert Wesarg 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: handle really long error messages in updateindex.

2010-01-23T22:22:28Z

As reported to msysGit (bug #340) it is possible to get some very long error messages when updating the index. The use of a label to display this prevents scrolling the output. This patch replaces the label with a scrollable text widget configured to look like a label. Signed-off-by: Pat Thoyts Signed-off-by: Shawn O. Pearce

git-gui: Make Ctrl-T safe to use for conflicting files.

2008-09-30T18:47:33Z

A previous patch added a check for conflict markers, which is done when the file is about to be staged due to a click on the icon. However, pressing Ctrl-T still immediately stages the file without confirmation. This patch fixes it. The check requires a loaded diff, so staging multiple files at once won't work if they are unmerged. Signed-off-by: Alexander Gavrilov Signed-off-by: Shawn O. Pearce

git-gui: Support conflict states _U & UT.

2008-09-05T04:28:55Z

Support _U (local deleted, remote modified) and UT (file type changed in conflict) modes. Note that 'file type changed' does not refer to changes in the executable bit, instead it denotes replacing a file with a link, or vice versa. Signed-off-by: Alexander Gavrilov Signed-off-by: Shawn O. Pearce