Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | mergetools: create mergetool_find_win32_cmd() helper function for winmerge | Jacob Nisnevich | 2016-04-04 | 2 | -20/+26 |
* | Merge branch 'ls/p4-doc-markup' | Junio C Hamano | 2016-03-24 | 1 | -6/+4 |
|\ | |||||
| * | Documentation: fix git-p4 AsciiDoc formattingls/p4-doc-markup | Lars Schneider | 2016-03-23 | 1 | -5/+3 |
| * | Documentation: use ASCII quotation marks in git-p4 | Lars Schneider | 2016-03-21 | 1 | -1/+1 |
* | | Merge branch 'js/mingw-tests-2.8' | Junio C Hamano | 2016-03-24 | 4 | -11/+19 |
|\ \ | |||||
| * | | mingw: skip some tests in t9115 due to file name issues | Johannes Schindelin | 2016-03-23 | 1 | -2/+2 |
| * | | t1300: fix the new --show-origin tests on Windows | Johannes Schindelin | 2016-03-23 | 1 | -3/+6 |
| * | | t1300-repo-config: make it resilient to being run via 'sh -x' | Johannes Schindelin | 2016-03-23 | 1 | -6/+2 |
| * | | config --show-origin: report paths with forward slashes | Johannes Schindelin | 2016-03-23 | 2 | -0/+9 |
* | | | Merge branch 'sb/submodule-module-list-pathspec-fix' | Junio C Hamano | 2016-03-24 | 2 | -3/+16 |
|\ \ \ | |||||
| * | | | submodule: fix regression for deinit without submodules | Stefan Beller | 2016-03-22 | 2 | -3/+16 |
* | | | | Merge branch 'master' of git://github.com/git-l10n/git-po | Junio C Hamano | 2016-03-23 | 3 | -3761/+11533 |
|\ \ \ \ | |_|/ / |/| | | | |||||
| * | | | Merge branch 'master' of https://github.com/vnwildman/git | Jiang Xin | 2016-03-23 | 1 | -30/+125 |
| |\ \ \ | |||||
| | * | | | l10n: vi.po (2530t): Update translation | Tran Ngoc Quan | 2016-03-21 | 1 | -30/+125 |
| * | | | | Merge branch 'master' of git://github.com/alexhenrie/git-po | Jiang Xin | 2016-03-23 | 1 | -1365/+1581 |
| |\ \ \ \ | |||||
| | * | | | | l10n: ca.po: update translation | Alex Henrie | 2016-03-21 | 1 | -1365/+1581 |
| | |/ / / | |||||
| * | | | | l10n: pt_PT: Update and add new translations | Vasco Almeida | 2016-03-22 | 1 | -2366/+9827 |
| |/ / / | |||||
* | | | | Git 2.8-rc4v2.8.0-rc4 | Junio C Hamano | 2016-03-21 | 1 | -1/+1 |
* | | | | Sync with maint | Junio C Hamano | 2016-03-21 | 2 | -3/+3 |
|\ \ \ \ | |||||
| * \ \ \ | Merge branch 'mm/doc-hooks-linkgit-fix' into maint | Junio C Hamano | 2016-03-21 | 1 | -1/+1 |
| |\ \ \ \ | |||||
| | * | | | | Documentation: fix broken linkgit to git-configmm/doc-hooks-linkgit-fix | Matthieu Moy | 2016-03-21 | 1 | -1/+1 |
| * | | | | | Merge branch 'es/st-add4-gcc-4.2-workaround' into maint | Junio C Hamano | 2016-03-21 | 1 | -2/+2 |
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | | | |||||
| | * | | | | git-compat-util: st_add4: work around gcc 4.2.x compiler crashes/st-add4-gcc-4.2-workaround | Eric Sunshine | 2016-03-21 | 1 | -2/+2 |
* | | | | | | Merge branch 'tb/avoid-gcc-on-darwin-10-6' | Junio C Hamano | 2016-03-21 | 1 | -3/+0 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Revert "config.mak.uname: use clang for Mac OS X 10.6"tb/avoid-gcc-on-darwin-10-6 | Eric Sunshine | 2016-03-21 | 1 | -3/+0 |
* | | | | | | | Merge tag 'l10n-2.8.0-rnd3' of git://github.com/git-l10n/git-po | Junio C Hamano | 2016-03-20 | 6 | -82/+283 |
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | | | |||||
| * | | | | | | l10n: zh_CN: review for git v2.8.0 l10n round 2 | Ray Chen | 2016-03-20 | 1 | -5/+5 |
| * | | | | | | l10n: de.po: add missing newlines | Ralf Thielow | 2016-03-17 | 1 | -2/+3 |
| * | | | | | | l10n: de.po: translate 22 new messages | Ralf Thielow | 2016-03-17 | 1 | -37/+136 |
| * | | | | | | Merge branch 'fr_v2.8.0_r3' of git://github.com/jnavila/git | Jiang Xin | 2016-03-17 | 1 | -5/+7 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | l10n: fr.po v2.8.0 round 3 | Jean-Noel Avila | 2016-03-15 | 1 | -5/+7 |
| * | | | | | | | Merge branch 'ko/merge-l10n' of https://github.com/changwoo/git-l10n-ko | Jiang Xin | 2016-03-17 | 1 | -3/+7 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | l10n: ko.po: Update Korean translation | Changwoo Ryu | 2016-03-16 | 1 | -3/+7 |
| | |/ / / / / / | |||||
| * | | | | | | | Merge branch 'master' of git://github.com/nafmo/git-l10n-sv | Jiang Xin | 2016-03-17 | 1 | -31/+122 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | l10n: sv.po: Update Swedish translation (2530t0f0u) | Peter Krefting | 2016-03-15 | 1 | -31/+122 |
| | |/ / / / / / | |||||
| * | | | | | | | l10n: ru.po: update Russian translation | Dimitriy Ryazantcev | 2016-03-15 | 1 | -2/+6 |
| |/ / / / / / | |||||
* | | | | | | | Merge branch 'master' of git://ozlabs.org/~paulus/gitk | Junio C Hamano | 2016-03-20 | 4 | -804/+788 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | gitk: Follow themed bgcolor in help dialogs | Guillermo S. Romero | 2016-03-19 | 1 | -4/+4 |
| * | | | | | | | gitk: fr.po: Sync translations with git | Jean-Noel Avila | 2016-03-19 | 1 | -50/+46 |
| * | | | | | | | gitk: Update French translation (311t) | Jean-Noel Avila | 2016-03-19 | 1 | -388/+373 |
| * | | | | | | | gitk: Update German translation | Ralf Thielow | 2016-03-19 | 1 | -46/+33 |
| * | | | | | | | gitk: Update Bulgarian translation (311t) | Alexander Shopov | 2016-03-19 | 1 | -320/+336 |
* | | | | | | | | RelNotes: remove the mention of !reinclusion | Junio C Hamano | 2016-03-18 | 1 | -5/+0 |
* | | | | | | | | Revert "Merge branch 'nd/exclusion-regression-fix'" | Junio C Hamano | 2016-03-18 | 7 | -378/+12 |
* | | | | | | | | Revert "Merge branch 'jc/exclusion-doc'" | Junio C Hamano | 2016-03-18 | 1 | -37/+1 |
* | | | | | | | | Sync with Git 2.7.4 | Junio C Hamano | 2016-03-17 | 5 | -3/+50 |
|\ \ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | | | |||||
| * | | | | | | | Git 2.7.4v2.7.4 | Junio C Hamano | 2016-03-17 | 3 | -2/+13 |
| * | | | | | | | Sync with Git 2.6.6 | Junio C Hamano | 2016-03-17 | 4 | -3/+39 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | Git 2.6.6v2.6.6 | Junio C Hamano | 2016-03-17 | 4 | -3/+15 |
| | * | | | | | | | Merge branch 'maint-2.5' into maint-2.6 | Junio C Hamano | 2016-03-17 | 16 | -148/+110 |
| | |\ \ \ \ \ \ \ |