Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'pt/gitgui-updates' | Junio C Hamano | 2016-10-26 | 26 | -1923/+1982 |
|\ | |||||
| * | 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 |
* | | | | | | | Merge branch 'jk/diff-submodule-diff-inline' | Junio C Hamano | 2016-10-26 | 2 | -1/+15 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | rev-list: use hdr_termination instead of a always using a newline | Jacob Keller | 2016-10-20 | 2 | -1/+15 |
* | | | | | | | | Merge branch 'tg/add-chmod+x-fix' | Junio C Hamano | 2016-10-26 | 1 | -0/+1 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | t3700: fix broken test under !SANITYtg/add-chmod+x-fix | Junio C Hamano | 2016-10-20 | 1 | -0/+1 |
* | | | | | | | | | Merge branch 'bw/submodule-branch-dot-doc' | Junio C Hamano | 2016-10-26 | 2 | -3/+8 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | submodules doc: update documentation for "." used for submodule branchesbw/submodule-branch-dot-doc | Brandon Williams | 2016-10-19 | 2 | -3/+8 |
* | | | | | | | | | | Merge branch 'pb/test-parse-options-expect' | Junio C Hamano | 2016-10-26 | 1 | -170/+13 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | t0040: convert all possible tests to use `test-parse-options --expect`pb/test-parse-options-expect | Pranit Bauva | 2016-10-17 | 1 | -170/+13 |
* | | | | | | | | | | | Merge branch 'jk/tighten-alloc' | Junio C Hamano | 2016-10-26 | 1 | -11/+6 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | inline xalloc_flex() into FLEXPTR_ALLOC_MEMjk/tighten-alloc | René Scharfe | 2016-10-17 | 1 | -9/+3 |
| * | | | | | | | | | | | avoid pointer arithmetic involving NULL in FLEX_ALLOC_MEM | René Scharfe | 2016-10-17 | 1 | -2/+3 |
* | | | | | | | | | | | | Merge branch 'va/i18n' | Junio C Hamano | 2016-10-26 | 6 | -50/+60 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | i18n: diff: mark warnings for translationva/i18n | Vasco Almeida | 2016-10-17 | 1 | -7/+7 |
| * | | | | | | | | | | | | i18n: credential-cache--daemon: mark advice for translation | Vasco Almeida | 2016-10-17 | 1 | -3/+3 |