Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge tag 'gitgui-0.21.0' of git://repo.or.cz/git-guipt/gitgui-updates | Junio C Hamano | 2016-10-20 | 26 | -1923/+1982 |
|\ | |||||
| * | git-gui: set version 0.21gitgui-0.21.0 | Pat Thoyts | 2016-10-20 | 1 | -1/+1 |
| * | Merge branch 'as/bulgarian' into pu | Pat Thoyts | 2016-10-20 | 2 | -1374/+1467 |
| |\ | |||||
| | * | git-gui: Mark 'All' in remote.tcl for translation | Alexander Shopov | 2016-10-20 | 1 | -4/+4 |
| | * | git-gui i18n: Updated Bulgarian translation (565,0f,0u) | Alexander Shopov | 2016-10-20 | 1 | -1370/+1463 |
| * | | Merge branch 'os/preserve-author' into pu | Pat Thoyts | 2016-10-20 | 1 | -3/+33 |
| |\ \ | |||||
| | * | | git-gui: avoid persisting modified author identity | Pat Thoyts | 2016-10-06 | 1 | -20/+31 |
| | * | | git-gui: Do not reset author details on amend | Orgad Shaneh | 2016-04-14 | 1 | -0/+19 |
| * | | | Merge branch 'kb/unicode' into pu | Pat Thoyts | 2016-10-20 | 3 | -30/+12 |
| |\ \ \ | | |_|/ | |/| | | |||||
| | * | | git-gui: handle the encoding of Git's output correctly | Karsten Blees | 2016-10-06 | 1 | -25/+4 |
| | * | | git-gui: unicode file name support on windows | Karsten Blees | 2016-10-06 | 3 | -8/+11 |
| |/ / | |||||
| * | | Merge branch 'dr/ru' into pu | Pat Thoyts | 2016-10-04 | 1 | -431/+249 |
| |\ \ | |||||
| | * | | git-gui: Update Russian translation | Dimitriy Ryazantcev | 2016-10-04 | 1 | -431/+249 |
| | |/ | |||||
| * | | git-gui: maintain backwards compatibility for merge syntax | Pat Thoyts | 2016-10-04 | 1 | -1/+10 |
| * | | Merge branch 'va/i18n_2' into pu | Pat Thoyts | 2016-10-03 | 17 | -36/+35 |
| |\ \ | |||||
| | * | | git-gui i18n: mark string in lib/error.tcl for translation | Vasco Almeida | 2016-10-03 | 1 | -1/+1 |
| | * | | git-gui: fix incorrect use of Tcl append command | Vasco Almeida | 2016-10-03 | 15 | -26/+25 |
| | * | | git-gui i18n: mark "usage:" strings for translation | Vasco Almeida | 2016-10-03 | 1 | -2/+2 |
| | * | | git-gui i18n: internationalize use of colon punctuation | Vasco Almeida | 2016-10-03 | 4 | -7/+7 |
| |/ / | |||||
| * | | Merge branch 'pt/non-mouse-usage' into pu | Pat Thoyts | 2016-10-03 | 2 | -42/+155 |
| |\ \ | |||||
| | * | | Amend tab ordering and text widget border and highlighting. | Pat Thoyts | 2016-10-02 | 2 | -31/+124 |
| | * | | Allow keyboard control to work in the staging widgets. | Pat Thoyts | 2016-10-01 | 1 | -12/+32 |
| | |/ | |||||
| * | | Merge branch 'pt/git4win-mods' into pu | Pat Thoyts | 2016-10-03 | 2 | -4/+11 |
| |\ \ | |||||
| | * | | git-gui (Windows): use git-gui.exe in `Create Desktop Shortcut` | Pat Thoyts | 2016-10-03 | 1 | -4/+7 |
| | * | | git-gui: fix detection of Cygwin | Pat Thoyts | 2016-10-03 | 1 | -0/+4 |
| | |/ | |||||
| * | | Merge branch 'patches' into pu | Pat Thoyts | 2016-10-03 | 4 | -2/+10 |
| |\ \ | |||||
| | * | | git-gui: ensure the file in the diff pane is in the list of selected files | Alex Riesen | 2016-10-03 | 1 | -0/+3 |
| | * | | git-gui: support for $FILENAMES in tool definitions | Alex Riesen | 2016-10-03 | 1 | -0/+3 |
| | * | | git-gui: fix initial git gui message encoding | yaras | 2016-10-03 | 1 | -0/+2 |
| | * | | git-gui/po/glossary/txt-to-pot.sh: use the $( ... ) construct for command sub... | Elia Pinto | 2016-10-03 | 1 | -2/+2 |
| | |/ | |||||
| * | | Merge branch 'va/i18n' into pu | Pat Thoyts | 2016-10-03 | 3 | -3/+3012 |
| |\ \ | |||||
| * \ \ | Merge branch 'rs/use-modern-git-merge-syntax' into pu | Pat Thoyts | 2016-10-03 | 1 | -6/+1 |
| |\ \ \ | |||||
| * \ \ \ | Merge branch 'js/commit-gpgsign' into pu | Pat Thoyts | 2016-10-03 | 1 | -0/+3 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'sy/i18n' into pu | Pat Thoyts | 2016-10-03 | 1 | -1309/+1438 |
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | | | |||||
| * | | | | | git-gui: sort entries in tclIndex | Olaf Hering | 2015-05-01 | 1 | -1/+1 |
* | | | | | | Sync with maint | Junio C Hamano | 2016-10-17 | 2 | -2417/+2813 |
|\ \ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge tag 'l10n-2.10.0-rnd2.4' of git://github.com/git-l10n/git-po into maint | Junio C Hamano | 2016-10-17 | 2 | -2417/+2813 |
| |\ \ \ \ \ \ | |||||
| | * \ \ \ \ \ | Merge branch 'russian-l10n' of https://github.com/DJm00n/git-po-ru | Jiang Xin | 2016-10-16 | 1 | -26/+26 |
| | |\ \ \ \ \ \ | |||||
| | | * | | | | | | l10n: ru.po: update Russian translation | Dimitriy Ryazantcev | 2016-07-12 | 1 | -26/+26 |
| | * | | | | | | | l10n: de.po: translate 260 new messages | Ralf Thielow | 2016-10-12 | 1 | -2387/+2783 |
| | * | | | | | | | l10n: de.po: fix translation of autostash | Ralf Thielow | 2016-09-12 | 1 | -4/+4 |
* | | | | | | | | | Tenth batch for 2.11 | Junio C Hamano | 2016-10-17 | 1 | -16/+49 |
* | | | | | | | | | Merge branch 'sb/submodule-config-doc-drop-path' | Junio C Hamano | 2016-10-17 | 1 | -5/+6 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | documentation: improve submodule.<name>.{url, path} descriptionsb/submodule-config-doc-drop-path | Stefan Beller | 2016-10-11 | 1 | -5/+6 |
* | | | | | | | | | | Merge branch 'rs/pretty-format-color-doc-fix' | Junio C Hamano | 2016-10-17 | 1 | -1/+2 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | pretty: fix document link for color specificationrs/pretty-format-color-doc-fix | René Scharfe | 2016-10-11 | 1 | -1/+2 |
| |/ / / / / / / / / | |||||
* | | | | | | | | | | Merge branch 'js/reset-usage' | Junio C Hamano | 2016-10-17 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | reset: fix usagejs/reset-usage | Johannes Schindelin | 2016-10-11 | 1 | -1/+1 |
| |/ / / / / / / / / | |||||
* | | | | | | | | | | Merge branch 'da/mergetool-diff-order' | Junio C Hamano | 2016-10-17 | 3 | -86/+165 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | mergetool: honor -O<orderfile>da/mergetool-diff-order | David Aguilar | 2016-10-11 | 3 | -6/+40 |