summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'pt/gitgui-updates'Junio C Hamano2016-10-2626-1923/+1982
|\
| * 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
* | | | | | | Merge branch 'jk/diff-submodule-diff-inline'Junio C Hamano2016-10-262-1/+15
|\ \ \ \ \ \ \
| * | | | | | | rev-list: use hdr_termination instead of a always using a newlineJacob Keller2016-10-202-1/+15
* | | | | | | | Merge branch 'tg/add-chmod+x-fix'Junio C Hamano2016-10-261-0/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | t3700: fix broken test under !SANITYtg/add-chmod+x-fixJunio C Hamano2016-10-201-0/+1
* | | | | | | | | Merge branch 'bw/submodule-branch-dot-doc'Junio C Hamano2016-10-262-3/+8
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | submodules doc: update documentation for "." used for submodule branchesbw/submodule-branch-dot-docBrandon Williams2016-10-192-3/+8
* | | | | | | | | | Merge branch 'pb/test-parse-options-expect'Junio C Hamano2016-10-261-170/+13
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | t0040: convert all possible tests to use `test-parse-options --expect`pb/test-parse-options-expectPranit Bauva2016-10-171-170/+13
* | | | | | | | | | | Merge branch 'jk/tighten-alloc'Junio C Hamano2016-10-261-11/+6
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | inline xalloc_flex() into FLEXPTR_ALLOC_MEMjk/tighten-allocRené Scharfe2016-10-171-9/+3
| * | | | | | | | | | | avoid pointer arithmetic involving NULL in FLEX_ALLOC_MEMRené Scharfe2016-10-171-2/+3
* | | | | | | | | | | | Merge branch 'va/i18n'Junio C Hamano2016-10-266-50/+60
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | i18n: diff: mark warnings for translationva/i18nVasco Almeida2016-10-171-7/+7
| * | | | | | | | | | | | i18n: credential-cache--daemon: mark advice for translationVasco Almeida2016-10-171-3/+3