summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge tag 'gitgui-0.21.0' of git://repo.or.cz/git-guipt/gitgui-updatesJunio C Hamano2016-10-2026-1923/+1982
|\
| * git-gui: set version 0.21gitgui-0.21.0Pat Thoyts2016-10-201-1/+1
| * Merge branch 'as/bulgarian' into puPat Thoyts2016-10-202-1374/+1467
| |\
| | * git-gui: Mark 'All' in remote.tcl for translationAlexander Shopov2016-10-201-4/+4
| | * git-gui i18n: Updated Bulgarian translation (565,0f,0u)Alexander Shopov2016-10-201-1370/+1463
| * | Merge branch 'os/preserve-author' into puPat Thoyts2016-10-201-3/+33
| |\ \
| | * | git-gui: avoid persisting modified author identityPat Thoyts2016-10-061-20/+31
| | * | git-gui: Do not reset author details on amendOrgad Shaneh2016-04-141-0/+19
| * | | Merge branch 'kb/unicode' into puPat Thoyts2016-10-203-30/+12
| |\ \ \ | | |_|/ | |/| |
| | * | git-gui: handle the encoding of Git's output correctlyKarsten Blees2016-10-061-25/+4
| | * | git-gui: unicode file name support on windowsKarsten Blees2016-10-063-8/+11
| |/ /
| * | Merge branch 'dr/ru' into puPat Thoyts2016-10-041-431/+249
| |\ \
| | * | git-gui: Update Russian translationDimitriy Ryazantcev2016-10-041-431/+249
| | |/
| * | git-gui: maintain backwards compatibility for merge syntaxPat Thoyts2016-10-041-1/+10
| * | Merge branch 'va/i18n_2' into puPat Thoyts2016-10-0317-36/+35
| |\ \
| | * | git-gui i18n: mark string in lib/error.tcl for translationVasco Almeida2016-10-031-1/+1
| | * | git-gui: fix incorrect use of Tcl append commandVasco Almeida2016-10-0315-26/+25
| | * | git-gui i18n: mark "usage:" strings for translationVasco Almeida2016-10-031-2/+2
| | * | git-gui i18n: internationalize use of colon punctuationVasco Almeida2016-10-034-7/+7
| |/ /
| * | Merge branch 'pt/non-mouse-usage' into puPat Thoyts2016-10-032-42/+155
| |\ \
| | * | Amend tab ordering and text widget border and highlighting.Pat Thoyts2016-10-022-31/+124
| | * | Allow keyboard control to work in the staging widgets.Pat Thoyts2016-10-011-12/+32
| | |/
| * | Merge branch 'pt/git4win-mods' into puPat Thoyts2016-10-032-4/+11
| |\ \
| | * | git-gui (Windows): use git-gui.exe in `Create Desktop Shortcut`Pat Thoyts2016-10-031-4/+7
| | * | git-gui: fix detection of CygwinPat Thoyts2016-10-031-0/+4
| | |/
| * | Merge branch 'patches' into puPat Thoyts2016-10-034-2/+10
| |\ \
| | * | git-gui: ensure the file in the diff pane is in the list of selected filesAlex Riesen2016-10-031-0/+3
| | * | git-gui: support for $FILENAMES in tool definitionsAlex Riesen2016-10-031-0/+3
| | * | git-gui: fix initial git gui message encodingyaras2016-10-031-0/+2
| | * | git-gui/po/glossary/txt-to-pot.sh: use the $( ... ) construct for command sub...Elia Pinto2016-10-031-2/+2
| | |/
| * | Merge branch 'va/i18n' into puPat Thoyts2016-10-033-3/+3012
| |\ \
| * \ \ Merge branch 'rs/use-modern-git-merge-syntax' into puPat Thoyts2016-10-031-6/+1
| |\ \ \
| * \ \ \ Merge branch 'js/commit-gpgsign' into puPat Thoyts2016-10-031-0/+3
| |\ \ \ \
| * \ \ \ \ Merge branch 'sy/i18n' into puPat Thoyts2016-10-031-1309/+1438
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | git-gui: sort entries in tclIndexOlaf Hering2015-05-011-1/+1
* | | | | | Sync with maintJunio C Hamano2016-10-172-2417/+2813
|\ \ \ \ \ \
| * \ \ \ \ \ Merge tag 'l10n-2.10.0-rnd2.4' of git://github.com/git-l10n/git-po into maintJunio C Hamano2016-10-172-2417/+2813
| |\ \ \ \ \ \
| | * \ \ \ \ \ Merge branch 'russian-l10n' of https://github.com/DJm00n/git-po-ruJiang Xin2016-10-161-26/+26
| | |\ \ \ \ \ \
| | | * | | | | | l10n: ru.po: update Russian translationDimitriy Ryazantcev2016-07-121-26/+26
| | * | | | | | | l10n: de.po: translate 260 new messagesRalf Thielow2016-10-121-2387/+2783
| | * | | | | | | l10n: de.po: fix translation of autostashRalf Thielow2016-09-121-4/+4
* | | | | | | | | Tenth batch for 2.11Junio C Hamano2016-10-171-16/+49
* | | | | | | | | Merge branch 'sb/submodule-config-doc-drop-path'Junio C Hamano2016-10-171-5/+6
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | documentation: improve submodule.<name>.{url, path} descriptionsb/submodule-config-doc-drop-pathStefan Beller2016-10-111-5/+6
* | | | | | | | | | Merge branch 'rs/pretty-format-color-doc-fix'Junio C Hamano2016-10-171-1/+2
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | pretty: fix document link for color specificationrs/pretty-format-color-doc-fixRené Scharfe2016-10-111-1/+2
| |/ / / / / / / / /
* | | | | | | | | | Merge branch 'js/reset-usage'Junio C Hamano2016-10-171-1/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | reset: fix usagejs/reset-usageJohannes Schindelin2016-10-111-1/+1
| |/ / / / / / / / /
* | | | | | | | | | Merge branch 'da/mergetool-diff-order'Junio C Hamano2016-10-173-86/+165
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | mergetool: honor -O<orderfile>da/mergetool-diff-orderDavid Aguilar2016-10-113-6/+40