summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* git-gui: show staged submodules regardless of ignore configjl/git-gui-show-added-submodule-changesJens Lehmann2014-04-152-1/+8
| | | | | | | | | | | | | | | Currently setting submodule.<name>.ignore and/or diff.ignoreSubmodules to "all" suppresses all output of submodule changes for git-gui. This is really confusing, as even when the user chooses to record a new commit for an ignored submodule by adding it manually this change won't show up under "Staged Changes (Will Commit)". Fix that by using the '--ignore-submodules=dirty' option for both callers of "git diff-index --cached" when the underlying git version supports that option. Signed-off-by: Jens Lehmann <Jens.Lehmann@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* git-gui 0.19gitgui-0.19.0Pat Thoyts2014-01-181-1/+1
| | | | Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
* git-gui: chmod +x po2msg, windows/git-gui.shJonathan Nieder2014-01-182-0/+0
| | | | | | | | | | | | The Makefile only runs po/po2msg.sh using tclsh, but because the script has the usual tcl preamble starting with #!/bin/sh it can also be run directly. The Windows git-gui wrapper is usable in-place for the same reason. Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
* git-gui: fallback right pane to packed widgets with Tk 8.4Max Kirillov2014-01-181-11/+21
| | | | | | | | | | | | | Since 918dbf58, git-gui crashes if started with Tk 8.4. The reason is that tk < 8.5 does not support -stretch option for panedwindow. Without the option it's not possible to properly expand the right half - the commit area is expanded, while desired behavior is to expand the diff area. So the whole feature should be disabled with Tk version less than 8.5. Signed-off-by: Max Kirillov <max@max630.net> Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
* git-gui i18n: Added Bulgarian translationAlexander Shopov2014-01-181-0/+2694
| | | | | Signed-off-by: Alexander Shopov <ash@kambanaria.org> Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
* git-gui l10n: Add 29 more terms to glossaryAlexander Shopov2014-01-181-0/+29
| | | | | Signed-off-by: Alexander Shopov <ash@kambanaria.org> Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
* git-gui i18n: Initial glossary in BulgarianAlexander Shopov2014-01-181-0/+287
| | | | | Signed-off-by: Alexander Shopov <ash@kambanaria.org> Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
* git-gui: correct spelling errors in commentsMasanari Iida2013-11-154-5/+5
| | | | | Signed-off-by: Masanari Iida <standby24x7@gmail.com> Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
* git-gui: add menu item to launch a bash shell on Windows.Pat Thoyts2013-09-121-0/+10
| | | | | | | | | When using git-gui as the primary git application on Windows it can be awkward obtaining a suitable shell. This commit adds a menu item to the Repository menu that launches the bash shell provided with the git installation on Windows. Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
* git-gui: corrected setup of git worktree under cygwin.John Murphy2013-09-061-1/+5
| | | | | | | | | | Under cygwin the _gitworktree variable needs to contain the Windows style path string so the output provided by git rev-parse must be converted from cygwin path style to native. Reviewed-by: Jesse Welch <jesse.welch@baml.com> Signed-off-by: John Patrick Murphy <john.murphy@baml.com> Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
* git-gui: right half window is panedMax Kirillov2013-08-271-5/+11
| | | | | | | | For long descriptions it would be nice to be able to resize the comment text field. Signed-off-by: Max Kirillov <max@max630.net> Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
* git-gui: Add gui.displayuntracked optionMax Kirillov2013-08-272-4/+11
| | | | | | | | | | | | | | | | | | | 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 <max@max630.net> Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
* git-gui: show the maxrecentrepo config option in the preferences dialogPat Thoyts2013-08-272-0/+2
| | | | Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
* git-gui: added gui.maxrecentrepo to extend the number of remembered reposPat Thoyts2013-08-271-2/+10
| | | | | | | | 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 <patthoyts@users.sourceforge.net>
* git-gui: Improve font rendering on retina macbooksMads Dørup2013-08-271-0/+2
| | | | | Signed-off-by: Mads Dørup <mads@dorup.dk> Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
* git-gui 0.18gitgui-0.18.0Pat Thoyts2013-06-151-1/+1
| | | | Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
* git-gui: avoid an error message when removing the last remotePat Thoyts2013-06-151-2/+4
| | | | | | | | | | 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ć <rivanvx@gmail.com> Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
* git-gui: fix file name handling with non-empty prefixJohn Keeping2013-06-071-11/+3
| | | | | | | | | | | | | | | | | | Commit e3d06ca (git-gui: Detect full path when parsing arguments - 2012-10-02) fixed the handling of absolute paths passed to the browser and blame subcommands by checking whether the file exists without the prefix before prepending the prefix and checking again. Since we have chdir'd to the top level of the working tree before doing this, this does not work if a file with the same name exists in a subdirectory and at the top level (for example Makefile in git.git's t/ directory). Instead of doing this, revert that patch and fix absolute path issue by using "file join" to prepend the prefix to the supplied path. This will correctly handle absolute paths by skipping the prefix in that case. Acked-by: Andrew Wong <andrew.kw.w@gmail.com> Signed-off-by: John Keeping <john@keeping.me.uk> Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
* git-gui: bring wish process to front on MacStefan Haller2013-06-071-0/+14
| | | | | | | | | | | | | | On Mac OS X, any application that is started from the Terminal will open behind all running applications; as a work-around, manually bring ourselves to the front. (Stolen from gitk, commit 76bf6ff93e.) We do this as the very first thing, so that any message boxes that might pop up during the rest of the startup sequence are actually seen by the user. [PT: added catch and moved down to ensure Tk has been loaded] Signed-off-by: Stefan Haller <stefan@haller-berlin.de> Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
* git-gui: change dialog button positions for Windows to suit platform.Pat Thoyts2013-05-171-1/+3
| | | | | | On windows it is more common to have cancel furthest on the right. Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
* git-gui: allow "\ No newline at end of file" for linewise stagingHeiko Voigt2013-05-161-2/+9
| | | | | | | | | Counting of lines did not skip this line when generating the hunk header. Acked-by: Tobias Preuss <tobias.preuss@googlemail.com> Signed-off-by: Heiko Voigt <hvoigt@hvoigt.net> Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
* git-gui: fix the mergetool launcher for the Beyond Compare tool.Pat Thoyts2013-02-221-2/+2
| | | | | | | | | 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 <warren@warrenfalk.com> Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
* Makefile: replace "echo 1>..." with "echo >..."Christian Couder2012-12-251-3/+3
| | | | | | | | This is clearer to many people this way. Signed-off-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
* French translation: copy -> copie.Grahack2012-11-281-1/+1
| | | | Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
* git-gui: Fix parsing of <rev> <path-which-not-present-in-worktree>Kirill Smelkov2012-11-131-0/+1
| | | | | | | | | | | | | | | | | Commit e3d06ca9 (git-gui: Detect full path when parsing arguments) broke git gui blame rev path-not-present-in-worktree in particular this does not work anymore: # in linux.git $ git gui blame 2bb8c26242c2393b097a993ffe9b003ec9b85395 drivers/net/sky2.c This patch restores the original functionality in this case. Acked-by: Andrew Wong <andrew.kw.w@gmail.com> Signed-off-by: Kirill Smelkov <kirr@mns.spb.ru> Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
* git-gui 0.17gitgui-0.17.0Pat Thoyts2012-10-171-1/+1
| | | | Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
* git-gui: Don't prepend the prefix if value looks like a full pathAndrew Wong2012-10-171-2/+7
| | | | | | | | | When argument parsing fails to detect a file name, "git-gui" will try to use the previously detected "head" as the file name. We should avoid prepending the prefix if "head" looks like a full path. Signed-off-by: Andrew Wong <andrew.kw.w@gmail.com> Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
* git-gui: Detect full path when parsing argumentsAndrew Wong2012-10-171-1/+10
| | | | | | | | | | | | | When running "git-gui blame" from a subfolder (which means prefix is non-empty), if we pass a full path as argument, the argument parsing will fail to recognize the argument as a file name, because prefix is prepended to the argument. This patch handles that scenario by adding an additional branch that checks the file name without using the prefix. Signed-off-by: Andrew Wong <andrew.kw.w@gmail.com> Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
* git-gui: remove .git/CHERRY_PICK_HEAD after committingBeat Bolli2012-09-171-0/+1
| | | | | | | | | | | 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 <bbolli@ewanet.ch> Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
* git-gui: Fix a loose/lose mistakeBeat Bolli2012-09-171-1/+1
| | | | | | Acked-by: Junio C Hamano <gitster@pobox.com> Signed-off-by: Beat Bolli <bbolli@ewanet.ch> Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
* git-gui: Fix semi-working shortcuts for unstage and revertVitaly _Vi Shukela2012-09-171-0/+4
| | | | | | | | | | | | Make Ctrl+U for unstaging and Ctrl+J for reverting selection behave more like Ctrl+T for adding. They were working only when one area was focused (diff or commit message), now they should work everywhere. Acked-by: Bert Wesarg <bert.wesarg@googlemail.com> Signed-off-by: Vitaly _Vi Shukela <vi0oss@gmail.com> Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
* Merge branch 'rt/trans'Pat Thoyts2012-06-191-18/+18
|\
| * git-gui: de.po: translate "remote" as "extern"Ralf Thielow2012-06-191-14/+14
| | | | | | | | | | | | | | | | According to the translation in git-core, we translate "remote" as "extern". Signed-off-by: Ralf Thielow <ralf.thielow@googlemail.com> Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
| * git-gui: de.po: translate "bare" as "bloß"Ralf Thielow2012-06-191-1/+1
| | | | | | | | | | | | | | | | According to the translation in git-core, we translate "bare" as "bloß". Signed-off-by: Ralf Thielow <ralf.thielow@googlemail.com> Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
| * git-gui: de.po: consistently add untranslated hook names within bracesRalf Thielow2012-06-191-3/+3
| | | | | | | | | | | | | | | | | | | | The user might not really know what hook is actually meant if it's translated. To avoid such a confusion we should consistently write it untranslated within braces after. Signed-off-by: Ralf Thielow <ralf.thielow@googlemail.com> Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
* | git-gui: preserve commit messages in utf-8Pat Thoyts2012-04-191-3/+8
| | | | | | | | | | | | | | | | | | | | The commit message buffer is automatically preserved to a local file but this uses the system encoding which may fail to properly encode unicode text. Forcing this file to use utf-8 preserves the message correctly. Reported-by: Ángel José Riesgo <ajriesgo@gmail.com> Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
* | git-gui: open console when using --trace on windowsHeiko Voigt2012-03-251-0/+1
|/ | | | | | | | | | When starting a gui program on windows stdout, stderr and stdin are not connected to the cmd console. As a workaround tk has a console window. Lets open this when the --trace commandline option has been given. This is helpful for debugging. Signed-off-by: Heiko Voigt <hvoigt@hvoigt.net> Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
* git-gui: fix a typo in po/ filesBenjamin Kerensa2012-03-1010-10/+10
| | | | | | | | | | "succeeded" was misspelled in the code, which propagated throughout the translations. Fixed all of them. Signed-off-by: Benjamin Kerensa <bkerensa <at> ubuntu.com> Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
* git-gui: Use PWD if it exists on Mac OS XMarcus Karlsson2012-03-101-1/+3
| | | | | | | | | | | | | | | | | | | The current working directory is set to / when git-gui is invoked using the Git Gui.app bundle on Mac OS X. This means that if it is launched from a directory which contains a repository then git-gui won't automatically find it unless the repository happens to be located in /. The PWD environment variable is however preserved if the bundle is invoked using open(1). If git-gui would check for PWD then a user could for example type open -a 'Git Gui' on a command line in order to launch the program and it would automatically find the repository. Teach git-gui to use the PWD environment variable on Mac OS X. Signed-off-by: Marcus Karlsson <mk@acc.umu.se> Signed-off-by: Junio C Hamano <gitster@pobox.com> Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
* git-gui: fix git-gui crash due to uninitialized variableClemens Buchacher2012-01-221-0/+1
| | | | | | | | | Recently, a clone initiated via git gui on Windows crashed on me due to an "unknown variable cdone". It turns out that there is a code path where this variable is used uninitialized. Signed-off-by: Clemens Buchacher <drizzd@aon.at> Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
* git-gui 0.16gitgui-0.16.0Pat Thoyts2011-12-131-1/+1
| | | | Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
* git-gui: handle shell script text filters when loading for blame.Pat Thoyts2011-12-092-11/+37
| | | | | | | | | | | | | | When loading a file into the blame window git-gui does all the work and must handle the text conversion filters if defined. On Windows it is necessary to detect the need for a shell script explicitly. Such filter commands are run using non-blocking I/O but this has the unfortunate side effect of losing any error that might be reported when the pipe is closed. Switching to blocking mode just before closing enables reporting of errors in the filter scripts to the user. Tested-by: Sebastian Schuberth <sschuberth@gmail.com> Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
* git-gui: Set both 16x16 and 32x32 icons on X to pacify Xming.Samuel Bronson2011-12-071-1/+4
| | | | | | | | | It would be better if the 32x32 icon was equivalent to the one used on Windows (in git-gui.ico), but I'm not sure how that would best be done, so I copied this code from gitk instead. Signed-off-by: Samuel Bronson <naesten@gmail.com> Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
* git-gui: added config gui.gcwarning to disable the gc hint messagePat Thoyts2011-11-301-1/+1
| | | | | | | | | | On startup in multicommit mode git-gui checks to see if the repository has a lot of objects. If so it shows a dialog suggesting gc be run. This adds 'gui.gcwarning' as a control config variable to allow this to be disabled. The default is true (the warning is shown). Setting this false will prevent the check being done. Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
* git-gui: set whitespace warnings appropriate to this projectPat Thoyts2011-11-301-0/+1
| | | | Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
* git-gui: don't warn for detached head when rebasingBert Wesarg2011-11-051-1/+3
| | | | | Signed-off-by: Bert Wesarg <bert.wesarg@googlemail.com> Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
* git-gui: make config gui.warndetachedcommit a booleanBert Wesarg2011-11-052-1/+2
| | | | | Signed-off-by: Bert Wesarg <bert.wesarg@googlemail.com> Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
* git-gui: add config value gui.diffopts for passing additional diff optionsTilman Vogel2011-11-053-0/+3
| | | | | Signed-off-by: Tilman Vogel <tilman.vogel@web.de> Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
* git-gui: sort the numeric ansi codesPat Thoyts2011-11-041-1/+1
| | | | | | This ensures that underline does not conflict with inverse colors. Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
* git-gui: support underline style when parsing diff outputPat Thoyts2011-11-042-1/+2
| | | | | Suggested-by: Bert Wesarg <bert.wesarg@googlemail.com> Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
View Lorry Controller Status