summaryrefslogtreecommitdiffstats
path: root/git-gui (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge https://github.com/j6t/git-guiJunio C Hamano2024-07-084-1601/+1674
|\ | | | | | | | | | | | | | | | | | | | | | | * https://github.com/j6t/git-gui: git-gui: fix inability to quit after closing another instance git-gui: sv.po: Update Swedish translation (576t0f0u) git-gui: note the new maintainer Makefile(s): do not enforce "all indents must be done with tab" Makefile(s): avoid recipe prefix in conditional statements doc: switch links to https doc: update links to current pages git-gui: po: fix typo in French "aperçu"
* | Makefile(s): do not enforce "all indents must be done with tab"Junio C Hamano2024-04-091-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | Our top-level Makefile follows our generic whitespace rule established by the top-level .gitattributes file that does not enforce indent-with-non-tab rule by default, but git-gui is set up to enforce indent-with-non-tab by default. With the upcoming change to GNU make, we no longer can reject (and worse, "fix") a patch that adds whitespace indented lines to the Makefile, so loosen the rule there for git-gui/Makefile, too. Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | Makefile(s): avoid recipe prefix in conditional statementsTaylor Blau2024-04-081-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In GNU Make commit 07fcee35 ([SV 64815] Recipe lines cannot contain conditional statements, 2023-05-22) and following, conditional statements may no longer be preceded by a tab character (which Make refers to as the recipe prefix). There are a handful of spots in our various Makefile(s) which will break in a future release of Make containing 07fcee35. For instance, trying to compile the pre-image of this patch with the tip of make.git results in the following: $ make -v | head -1 && make GNU Make 4.4.90 config.mak.uname:842: *** missing 'endif'. Stop. The kernel addressed this issue in 82175d1f9430 (kbuild: Replace tabs with spaces when followed by conditionals, 2024-01-28). Address the issues in Git's tree by applying the same strategy. When a conditional word (ifeq, ifneq, ifdef, etc.) is preceded by one or more tab characters, replace each tab character with 8 space characters with the following: find . -type f -not -path './.git/*' -name Makefile -or -name '*.mak' | xargs perl -i -pe ' s/(\t+)(ifn?eq|ifn?def|else|endif)/" " x (length($1) * 8) . $2/ge unless /\\$/ ' The "unless /\\$/" removes any false-positives (like "\telse \" appearing within a shell script as part of a recipe). After doing so, Git compiles on newer versions of Make: $ make -v | head -1 && make GNU Make 4.4.90 GIT_VERSION = 2.44.0.414.gfac1dc44ca9 [...] $ echo $? 0 Reported-by: Dario Gjorgjevski <dario.gjorgjevski@gmail.com> Signed-off-by: Taylor Blau <me@ttaylorr.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | Merge branch 'js/update-urls-in-doc-and-comment'Junio C Hamano2023-12-183-5/+5
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Stale URLs have been updated to their current counterparts (or archive.org) and HTTP links are replaced with working HTTPS links. * js/update-urls-in-doc-and-comment: doc: refer to internet archive doc: update links for andre-simon.de doc: switch links to https doc: update links to current pages
| * | doc: switch links to httpsJosh Soref2023-11-263-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | These sites offer https versions of their content. Using the https versions provides some protection for users. Signed-off-by: Josh Soref <jsoref@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
| * | doc: update links to current pagesJosh Soref2023-11-261-1/+1
| | | | | | | | | | | | | | | | | | | | | It's somewhat traditional to respect sites' self-identification. Signed-off-by: Josh Soref <jsoref@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | Merge git-gui into ml/git-gui-exec-path-fixJunio C Hamano2023-09-181-26/+3
|\ \ \ | |/ / |/| / | |/ | | | | * git-gui: git-gui - use git-hook, honor core.hooksPath git-gui - re-enable use of hook scripts
* | Merge https://github.com/prati0100/git-guiJunio C Hamano2023-08-245-237/+153
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * https://github.com/prati0100/git-gui: git-gui - use mkshortcut on Cygwin git-gui - use cygstart to browse on Cygwin git-gui - remove obsolete Cygwin specific code git gui Makefile - remove Cygwin modifications Makefiles: change search through $(MAKEFLAGS) for GNU make 4.4 Work around Tcl's default `PATH` lookup Move the `_which` function (almost) to the top Move is_<platform> functions to the beginning is_Cygwin: avoid `exec`ing anything windows: ignore empty `PATH` elements git-gui: Fix a typo in README
* | Makefiles: change search through $(MAKEFLAGS) for GNU make 4.4Ævar Arnfjörð Bjarmason2022-11-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since GNU make 4.4 the semantics of the $(MAKEFLAGS) variable has changed in a backward-incompatible way, as its "NEWS" file notes: Previously only simple (one-letter) options were added to the MAKEFLAGS variable that was visible while parsing makefiles. Now, all options are available in MAKEFLAGS. If you want to check MAKEFLAGS for a one-letter option, expanding "$(firstword -$(MAKEFLAGS))" is a reliable way to return the set of one-letter options which can be examined via findstring, etc. This upstream change meant that e.g.: make man Would become very noisy, because in shared.mak we rely on extracting "s" from the $(MAKEFLAGS), which now contains long options like "--jobserver-auth=fifo:<path>", which we'll conflate with the "-s" option. So, let's change this idiom we've been carrying since [1], [2] and [3] as the "NEWS" suggests. Note that the "-" in "-$(MAKEFLAGS)" is critical here, as the variable will always contain leading whitespace if there are no short options, but long options are present. Without it e.g. "make --debug=all" would yield "--debug=all" as the first word, but with it we'll get "-" as intended. Then "-s" for "-s", "-Bs" for "-s -B" etc. 1. 0c3b4aac8ec (git-gui: Support of "make -s" in: do not output anything of the build itself, 2007-03-07) 2. b777434383b (Support of "make -s": do not output anything of the build itself, 2007-03-07) 3. bb2300976ba (Documentation/Makefile: make most operations "quiet", 2009-03-27) Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | Merge https://github.com/prati0100/git-guiJunio C Hamano2021-03-042-21/+2
|\| | | | | | | | | * https://github.com/prati0100/git-gui: Revert "git-gui: remove lines starting with the comment character"
* | Merge https://github.com/prati0100/git-guiJunio C Hamano2021-03-013-3/+22
|\| | | | | | | | | | | * https://github.com/prati0100/git-gui: git-gui: remove lines starting with the comment character git-gui: fix typo in russian locale
* | Merge https://github.com/prati0100/git-guiJunio C Hamano2020-12-196-1397/+1711
|\| | | | | | | | | | | | | | | | | | | | | | | * https://github.com/prati0100/git-gui: git-gui: use gray background for inactive text widgets git-gui: Fix selected text colors Makefile: conditionally include GIT-VERSION-FILE git-gui: fix colored label backgrounds when using themed widgets git-gui: ssh-askpass: add a checkbox to show the input text git-gui: update Russian translation git-gui: use commit message template git-gui: Only touch GITGUI_MSG when needed
* | Merge https://github.com/prati0100/git-guiJunio C Hamano2020-10-173-49/+93
|\| | | | | | | | | | | | | * https://github.com/prati0100/git-gui: git-gui: blame: prevent tool tips from sticking around after Command-Tab git-gui: improve dark mode support git-gui: fix mixed tabs and spaces; prefer tabs
* | Merge https://github.com/prati0100/git-gui into masterJunio C Hamano2020-07-201-24/+3
|\| | | | | | | | | * https://github.com/prati0100/git-gui: git-gui: allow opening work trees from the startup dialog
* | Merge https://github.com/prati0100/git-guiJunio C Hamano2020-05-213-6/+8
|\| | | | | | | | | | | * https://github.com/prati0100/git-gui: git-gui: Handle Ctrl + BS/Del in the commit msg Subject: git-gui: fix syntax error because of missing semicolon
* | Merge https://github.com/prati0100/git-guiJunio C Hamano2020-03-2010-2793/+3854
|\| | | | | | | | | | | | | | | | | | | | | | | * 'master' of https://github.com/prati0100/git-gui: git-gui: create a new namespace for chord script evaluation git-gui: reduce Tcl version requirement from 8.6 to 8.5 git-gui--askpass: coerce answers to UTF-8 on Windows git-gui: fix error popup when doing blame -> "Show History Context" git-gui: add missing close bracket git-gui: update German translation git-gui: extend translation glossary template with more terms git-gui: update pot template and German translation to current source code
* | Merge https://github.com/prati0100/git-guiJunio C Hamano2020-01-0810-232/+920
|\| | | | | | | | | | | | | | | | | | | * https://github.com/prati0100/git-gui: git-gui: allow opening currently selected file in default app git-gui: allow closing console window with Escape git gui: fix branch name encoding error git-gui: revert untracked files by deleting them git-gui: update status bar to track operations git-gui: consolidate naming conventions
* | Merge https://github.com/prati0100/git-guiJunio C Hamano2019-11-044-21/+210
|\| | | | | | | | | | | | | | | | | | | | | * https://github.com/prati0100/git-gui: git-gui: improve Japanese translation git-gui: add a readme git-gui: support for diff3 conflict style git-gui: use existing interface to query a path's attribute git-gui (Windows): use git-bash.exe if it is available treewide: correct several "up-to-date" to "up to date" Fix build with core.autocrlf=true
* | Merge branch 'master' of https://github.com/prati0100/git-guiJunio C Hamano2019-09-185-55/+199
|\| | | | | | | | | | | | | | | | | | | | | | | * 'master' of https://github.com/prati0100/git-gui: git-gui: add hotkey to toggle "Amend Last Commit" git-gui: add horizontal scrollbar to commit buffer git-gui: convert new/amend commit radiobutton to checkbutton git-gui: add hotkeys to set widget focus git-gui: allow undoing last revert git-gui: return early when patch fails to apply git-gui: allow reverting selected hunk git-gui: allow reverting selected lines
* | Merge branch 'py/call-do-quit-before-exit' of github.com:gitster/git-gui ↵Junio C Hamano2019-08-071-2/+17
|\| | | | | | | | | | | | | into py/git-gui-do-quit * 'py/call-do-quit-before-exit' of github.com:gitster/git-gui: git-gui: call do_quit before destroying the main window
* | Merge branch 'cb/git-gui-ttk-style'Junio C Hamano2018-04-251-5/+10
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | "git gui" has been taught to work with old versions of tk (like 8.5.7) that do not support "ttk::style theme use" as a way to query the current theme. * cb/git-gui-ttk-style: git-gui: workaround ttk:style theme use
| * | Merge branch 'cb/ttk-style' of git-gui into cb/git-gui-ttk-styleJunio C Hamano2018-03-061-5/+10
| |\| | | | | | | | | | | | | * 'cb/ttk-style' of git-gui: git-gui: workaround ttk:style theme use
* | | Merge branch 'bp/git-gui-bind-kp-enter'Junio C Hamano2018-04-251-0/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "git gui" performs commit upon CTRL/CMD+ENTER but the CTRL/CMD+KP_ENTER (i.e. enter key on the numpad) did not have the same key binding. It now does. * bp/git-gui-bind-kp-enter: git-gui: bind CTRL/CMD+numpad ENTER to do_commit
| * \ \ Merge branch 'bp/bind-kp-enter' of git-gui into bp/git-gui-bind-kp-enterJunio C Hamano2018-03-031-0/+1
| |\ \ \ | | |/ / | |/| / | | |/ | | | * 'bp/bind-kp-enter' of git-gui: git-gui: bind CTRL/CMD+numpad ENTER to do_commit
* | | Merge branch 'bb/ssh-key-files' of git-gui into bb/git-gui-ssh-key-filesJunio C Hamano2018-03-031-1/+4
|\ \ \ | |/ / |/| / | |/ | | * 'bb/ssh-key-files' of git-gui: git-gui: search for all current SSH key types
* | Merge branch 'js/misc-git-gui-stuff' of ../git-guiJunio C Hamano2018-01-092-1/+27
|\| | | | | | | | | | | | | | | * 'js/misc-git-gui-stuff' of ../git-gui: git-gui: allow Ctrl+T to toggle multiple paths git-gui: fix exception when trying to stage with empty file list git-gui: avoid exception upon Ctrl+T in an empty list git gui: fix staging a second line to a 1-line file
* | Merge branch 'ls/git-gui-no-double-utf8-author-name'Junio C Hamano2017-12-191-3/+9
|\ \ | | | | | | | | | | | | | | | | | | | | | Amending commits in git-gui broke the author name that is non-ascii due to incorrect enconding conversion. * ls/git-gui-no-double-utf8-author-name: git-gui: prevent double UTF-8 conversion
| * | Merge branch 'ls/no-double-utf8-author-name' of ../git-gui into ↵Junio C Hamano2017-12-051-3/+9
| |\| | | | | | | | | | | | | | | | | | | ls/git-gui-no-double-utf8-author-name * 'ls/no-double-utf8-author-name' of ../git-gui: git-gui: prevent double UTF-8 conversion
* | | Merge branch 'jn/reproducible-build' of ../git-gui into jn/reproducible-buildJunio C Hamano2017-11-221-1/+1
|\ \ \ | |/ / |/| / | |/ | | * 'jn/reproducible-build' of ../git-gui: git-gui: sort entries in optimized tclIndex
* | Merge branch 'tz/fsf-address-update' of ../git-gui into tz/fsf-address-updateJunio C Hamano2017-11-091-2/+1
|\| | | | | | | | | * 'tz/fsf-address-update' of ../git-gui: Replace Free Software Foundation address in license notices
* | Merge branch 'ma/up-to-date'Junio C Hamano2017-09-101-1/+1
|\ \ | | | | | | | | | | | | | | | | | | | | | Message and doc updates. * ma/up-to-date: treewide: correct several "up-to-date" to "up to date" Documentation/user-manual: update outdated example output
| * | treewide: correct several "up-to-date" to "up to date"Martin Ågren2017-08-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Follow the Oxford style, which says to use "up-to-date" before the noun, but "up to date" after it. Don't change plumbing (specifically send-pack.c, but transport.c (git push) also has the same string). This was produced by grepping for "up-to-date" and "up to date". It turned out we only had to edit in one direction, removing the hyphens. Fix a typo in Documentation/git-diff-index.txt while we're there. Reported-by: Jeffrey Manian <jeffrey.manian@gmail.com> Reported-by: STEVEN WHITE <stevencharleswhitevoices@gmail.com> Signed-off-by: Martin Ågren <martin.agren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | Merge branch 'js/msgfmt-on-windows' of ../git-gui into ↵Junio C Hamano2017-07-252-7/+12
|\ \ \ | |/ / |/| / | |/ | | | | | | | | | | | | | | js/git-gui-msgfmt-on-windows * 'js/msgfmt-on-windows' of ../git-gui: git-gui (MinGW): make use of MSys2's msgfmt git gui: allow for a long recentrepo list git gui: de-dup selected repo from recentrepo history git gui: cope with duplicates in _get_recentrepo git-gui: remove duplicate entries from .gitconfig's gui.recentrepo
* | Fix build with core.autocrlf=trueJohannes Schindelin2017-05-101-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On Windows, the default line endings are denoted by a Carriage Return byte followed by a Line Feed byte, while Linux and MacOSX use a single Line Feed byte to denote a line ending. To help with this situation, Git introduced several mechanisms over the last decade, most prominently the `core.autocrlf` setting. Sometimes, however, a single setting is incorrect, e.g. when certain files in the source code are to be consumed by software that can handle only LF line endings, while other files can use whatever is appropriate for the current platform. To allow for that, Git added the `eol` option to its .gitattributes handling, expecting every user of Git to mark their source code appropriately. Bash assumes that line-endings of scripts are denoted by a single Line Feed byte. Therefore, shell scripts in Git's source code are one example where that `eol=lf` option is *required*. When generating common-cmds.h, the Unix tools we use generally operate on the assumption that input and output deliminate their lines using LF-only line endings. Consequently, they would happily copy the CR byte verbatim into the strings in common-cmds.h, which in turn makes the C preprocessor barf (that interprets them as MacOS-style line endings). Therefore, we have to mark the input files as LF-only: command-list.txt and Documentation/git-*.txt. Quite a bit belatedly, this patch brings Git's own source code in line with those expectations by setting those attributes to allow for a correct build even when core.autocrlf=true. This patch can be validated even on Linux, by using this cadence: git config core.autocrlf true rm .git/index && git stash make -j15 DEVELOPER=1 Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Reviewed-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | Merge tag 'gitgui-0.21.0' of git://repo.or.cz/git-guiJunio C Hamano2016-10-2026-1923/+1982
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git-gui 0.21.0 * tag 'gitgui-0.21.0' of git://repo.or.cz/git-gui: (22 commits) git-gui: set version 0.21 git-gui: Mark 'All' in remote.tcl for translation git-gui i18n: Updated Bulgarian translation (565,0f,0u) git-gui: avoid persisting modified author identity git-gui: handle the encoding of Git's output correctly git-gui: unicode file name support on windows git-gui: Update Russian translation git-gui: maintain backwards compatibility for merge syntax git-gui i18n: mark string in lib/error.tcl for translation git-gui: fix incorrect use of Tcl append command git-gui i18n: mark "usage:" strings for translation git-gui i18n: internationalize use of colon punctuation git-gui: ensure the file in the diff pane is in the list of selected files git-gui: support for $FILENAMES in tool definitions git-gui: fix initial git gui message encoding git-gui/po/glossary/txt-to-pot.sh: use the $( ... ) construct for command substitution git-gui (Windows): use git-gui.exe in `Create Desktop Shortcut` git-gui: fix detection of Cygwin Amend tab ordering and text widget border and highlighting. Allow keyboard control to work in the staging widgets. ...
* | Merge branch 'va/git-gui-i18n'Junio C Hamano2016-10-033-3/+3012
|\ \ | | | | | | | | | | | | | | | | | | | | | "git gui" l10n to Portuguese. * va/git-gui-i18n: git-gui: l10n: add Portuguese translation git-gui i18n: mark strings for translation
| * | Merge branch 'va/i18n' of ../git-gui into va/git-gui-i18nJunio C Hamano2016-09-263-3/+3012
| |\| | | | | | | | | | | | | | | | * 'va/i18n' of ../git-gui: git-gui: l10n: add Portuguese translation git-gui i18n: mark strings for translation
* | | Merge branch 'rs/git-gui-use-modern-git-merge-syntax'Junio C Hamano2016-10-031-6/+1
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | The original command line syntax for "git merge", which was "git merge <msg> HEAD <parent>...", has been deprecated for quite some time, and "git gui" was the last in-tree user of the syntax. This is finally fixed, so that we can move forward with the deprecation. * rs/git-gui-use-modern-git-merge-syntax: git-gui: stop using deprecated merge syntax
| * | Merge branch 'rs/use-modern-git-merge-syntax' of git-gui into ↵Junio C Hamano2016-09-261-6/+1
| |\| | | | | | | | | | | | | | | | | | | rs/git-gui-use-modern-git-merge-syntax * 'rs/use-modern-git-merge-syntax' of git-gui: git-gui: stop using deprecated merge syntax
* | | Merge branch 'js/git-gui-commit-gpgsign'Junio C Hamano2016-09-151-0/+3
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "git commit-tree" stopped reading commit.gpgsign configuration variable that was meant for Porcelain "git commit" in Git 2.9; we forgot to update "git gui" to look at the configuration to match this change. * js/git-gui-commit-gpgsign: git-gui: respect commit.gpgsign again
| * \ \ Merge branch 'js/commit-gpgsign' of ../git-gui into js/git-gui-commit-gpgsignJunio C Hamano2016-09-111-0/+3
| |\ \ \ | | |/ / | |/| / | | |/ | | | * 'js/commit-gpgsign' of ../git-gui: git-gui: respect commit.gpgsign again
* | | Merge branch 'sy/i18n' of git-guiJunio C Hamano2016-09-071-1309/+1438
|\ \ \ | |/ / |/| / | |/ | | | | | | | | | | | | * 'sy/i18n' of git-gui: git-gui: update Japanese information git-gui: update Japanese translation git-gui: add Japanese language code git-gui: apply po template to Japanese translation git-gui: consistently use the same word for "blame" in Japanese git-gui: consistently use the same word for "remote" in Japanese
* | git-gui/po/glossary/txt-to-pot.sh: use the $( ... ) construct for command ↵Elia Pinto2015-12-281-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | substitution The Git CodingGuidelines prefer the $(...) construct for command substitution instead of using the backquotes `...`. The backquoted form is the traditional method for command substitution, and is supported by POSIX. However, all but the simplest uses become complicated quickly. In particular, embedded command substitutions and/or the use of double quotes require careful escaping with the backslash character. The patch was generated by: for _f in $(find . -name "*.sh") do perl -i -pe 'BEGIN{undef $/;} s/`(.+?)`/\$(\1)/smg' "${_f}" done and then carefully proof-read. Signed-off-by: Elia Pinto <gitter.spiros@gmail.com> Reviewed-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | Merge tag 'gitgui-0.20.0' of http://repo.or.cz/r/git-guiJunio C Hamano2015-04-1910-1773/+4690
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git-gui 0.20.0 * tag 'gitgui-0.20.0' of http://repo.or.cz/r/git-gui: git-gui: set version 0.20 git-gui: sv.po: Update Swedish translation (547t0f0u) git-gui i18n: Updated Bulgarian translation (547t,0f,0u) git-gui: Makes chooser set 'gitdir' to the resolved path git-gui: Fixes chooser not accepting gitfiles git-gui: reinstate support for Tcl 8.4 git-gui: fix problem with gui.maxfilesdisplayed git-gui: fix verbose loading when git path contains spaces. git-gui/gitk: Do not depend on Cygwin's "kill" command on Windows git-gui: add configurable tab size to the diff view git-gui: Make git-gui lib dir configurable at runime git-gui i18n: Updated Bulgarian translation (520t,0f,0u) L10n: vi.po (543t): Init translation for Vietnamese git-gui: align the new recursive checkbox with the radiobuttons. git-gui: Add a 'recursive' checkbox in the clone menu.
* | Merge git://repo.or.cz/git-guiJunio C Hamano2014-06-262-1/+8
|\| | | | | | | | | | | * git://repo.or.cz/git-gui: git-gui: tolerate major version changes when comparing the git version git-gui: show staged submodules regardless of ignore config
* | Merge branch 'jl/use-vsatisfy-correctly-for-2.0'Junio C Hamano2014-05-191-2/+2
|\| | | | | | | | | * jl/use-vsatisfy-correctly-for-2.0: git-gui: tolerate major version changes when comparing the git version
* | Merge tag 'gitgui-0.19.0' of http://repo.or.cz/r/git-guiJunio C Hamano2014-01-217-12/+3032
|\| | | | | | | | | | | | | | | | | | | | | | | git-gui 0.19.0 * tag 'gitgui-0.19.0' of http://repo.or.cz/r/git-gui: git-gui 0.19 git-gui: chmod +x po2msg, windows/git-gui.sh git-gui: fallback right pane to packed widgets with Tk 8.4 git-gui i18n: Added Bulgarian translation git-gui l10n: Add 29 more terms to glossary git-gui i18n: Initial glossary in Bulgarian
* | Merge git://repo.or.cz/git-guiJunio C Hamano2013-12-098-17/+56
|\| | | | | | | | | | | | | | | | | | | | | | | * git://repo.or.cz/git-gui: git-gui: correct spelling errors in comments git-gui: add menu item to launch a bash shell on Windows. git-gui: corrected setup of git worktree under cygwin. git-gui: right half window is paned git-gui: Add gui.displayuntracked option git-gui: show the maxrecentrepo config option in the preferences dialog git-gui: added gui.maxrecentrepo to extend the number of remembered repos git-gui: Improve font rendering on retina macbooks
* | Merge tag 'gitgui-0.18.0' of git://repo.or.cz/git-guiJunio C Hamano2013-06-178-22/+40
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git-gui 0.18.0 * tag 'gitgui-0.18.0' of git://repo.or.cz/git-gui: git-gui 0.18 git-gui: avoid an error message when removing the last remote git-gui: fix file name handling with non-empty prefix git-gui: bring wish process to front on Mac git-gui: change dialog button positions for Windows to suit platform. git-gui: allow "\ No newline at end of file" for linewise staging git-gui: fix the mergetool launcher for the Beyond Compare tool. Makefile: replace "echo 1>..." with "echo >..." French translation: copy -> copie. git-gui: Fix parsing of <rev> <path-which-not-present-in-worktree>
* | Merge tag 'gitgui-0.17.0' of git://repo.or.cz/git-guiJunio C Hamano2012-10-1815-37/+65
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git-gui 0.17.0 * tag 'gitgui-0.17.0' of git://repo.or.cz/git-gui: git-gui 0.17 git-gui: Don't prepend the prefix if value looks like a full path git-gui: Detect full path when parsing arguments git-gui: remove .git/CHERRY_PICK_HEAD after committing git-gui: Fix a loose/lose mistake git-gui: Fix semi-working shortcuts for unstage and revert git-gui: de.po: translate "remote" as "extern" git-gui: de.po: translate "bare" as "bloß" git-gui: de.po: consistently add untranslated hook names within braces git-gui: preserve commit messages in utf-8 git-gui: open console when using --trace on windows git-gui: fix a typo in po/ files git-gui: Use PWD if it exists on Mac OS X git-gui: fix git-gui crash due to uninitialized variable
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-22 01:05:35 +0100