user/sven/git.git/lib, branch gitgui-0.19.0

git-gui: correct spelling errors in comments

2013-11-15T20:44:08Z

Signed-off-by: Masanari Iida Signed-off-by: Pat Thoyts

git-gui: Add gui.displayuntracked option

2013-08-27T19:06:42Z

When git is used to track only a subset of a directory, or there is no sure way to divide files to ignore from files to track, git user have to live with large number of untracked files. These files present in file list, and should always be scrolled through to handle real changes. Situation can become even worse, then number of the untracked files grows above the maxfilesdisplayed limit. In the case, even staged can be hidden by git-gui. This change introduces new configuration variable gui.displayuntracked, which, when set to false, instructs git-gui not to show untracked files in files list. They can be staged from commandline or other tools (like IDE of file manager), then they become visible. Default value of the option is true, which is compatible with current behavior. Signed-off-by: Max Kirillov Signed-off-by: Pat Thoyts

git-gui: show the maxrecentrepo config option in the preferences dialog

2013-08-27T19:06:42Z

Signed-off-by: Pat Thoyts

git-gui: added gui.maxrecentrepo to extend the number of remembered repos

2013-08-27T19:06:41Z

The list of recently opened repositories shown when launching git-gui from outside a repository was hard coded to only show a maximum of 10 items. This config variable allows the user to override this default. Signed-off-by: Pat Thoyts

git-gui: avoid an error message when removing the last remote

2013-06-15T22:36:27Z

When the last remote is removed on a system that has tearoff menu items the code that adjusts the fetch and prune menus may raise an error when probing the menu entry for a non-existing -label option. Check the entry type to avoid this fault. Reported-by: Vedran Miletić Signed-off-by: Pat Thoyts

git-gui: change dialog button positions for Windows to suit platform.

2013-05-17T09:51:01Z

On windows it is more common to have cancel furthest on the right. Signed-off-by: Pat Thoyts

git-gui: allow "\ No newline at end of file" for linewise staging

2013-05-16T22:40:59Z

Counting of lines did not skip this line when generating the hunk header. Acked-by: Tobias Preuss Signed-off-by: Heiko Voigt Signed-off-by: Pat Thoyts

git-gui: fix the mergetool launcher for the Beyond Compare tool.

2013-02-22T20:13:21Z

When using Beyond Compare as the mergetool it fails to save the merged result correctly due to a quoting problem when executing the tool. This patch solves the quoting problem. Signed-off-by: Warren Falk Signed-off-by: Pat Thoyts

git-gui: remove .git/CHERRY_PICK_HEAD after committing

2012-09-17T10:59:05Z

Adding _git_ps1() to one's bash prompt displays various repo status info after each command. After committing a git cherry-pick -n using git-gui, the prompt still contains the "|CHERRY-PICKING" flag. Delete the file causing this flag when cleaning up. Signed-off-by: Beat Bolli Signed-off-by: Pat Thoyts

git-gui: Fix a loose/lose mistake

2012-09-17T10:53:37Z

Acked-by: Junio C Hamano Signed-off-by: Beat Bolli Signed-off-by: Pat Thoyts