summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* mingw: document the standard handle redirectionjs/mingw-redirect-std-handlesJohannes Schindelin2017-11-021-0/+18
* mingw: optionally redirect stderr/stdout via the same handleJohannes Schindelin2017-11-022-1/+22
* mingw: add experimental feature to redirect standard handlesJohannes Schindelin2017-11-022-0/+49
* Git 2.15v2.15.0Junio C Hamano2017-10-301-1/+1
* Merge tag 'l10n-2.15.0-rnd2.1' of git://github.com/git-l10n/git-poJunio C Hamano2017-10-301-58/+123
|\
| * l10n: Update Catalan translationJordi Mas2017-10-291-58/+123
* | Hopefully final batch before 2.15Junio C Hamano2017-10-281-0/+7
* | Merge branch 'sg/rev-list-doc-reorder-fix'Junio C Hamano2017-10-281-3/+3
|\ \
| * | rev-list-options.txt: use correct directional referencesg/rev-list-doc-reorder-fixSZEDER Gábor2017-10-271-3/+3
* | | Merge branch 'sb/rev-parse-show-superproject-root'Junio C Hamano2017-10-281-1/+1
|\ \ \
| * | | docs: fix formatting of rev-parse's --show-superproject-working-treesb/rev-parse-show-superproject-rootSebastian Schuberth2017-10-271-1/+1
* | | | Merge branch 'ao/path-use-xmalloc'Junio C Hamano2017-10-281-1/+1
|\ \ \ \
| * | | | path.c: use xmalloc() in add_to_trie()ao/path-use-xmallocAndrey Okoshkin2017-10-251-1/+1
* | | | | Merge branch 'np/config-path-doc'Junio C Hamano2017-10-281-4/+4
|\ \ \ \ \
| * | | | | config doc: clarify "git config --path" examplenp/config-path-docNathan Payre2017-10-191-4/+4
* | | | | | Merge branch 'mh/ref-locking-fix'Junio C Hamano2017-10-262-1/+142
|\ \ \ \ \ \
| * | | | | | files_transaction_prepare(): fix handling of ref lock failuremh/ref-locking-fixMichael Haggerty2017-10-252-9/+9
| * | | | | | t1404: add a bunch of tests of D/F conflictsMichael Haggerty2017-10-251-0/+141
* | | | | | | Merge tag 'l10n-2.15.0-rnd2' of git://github.com/git-l10n/git-poJunio C Hamano2017-10-2412-24768/+42782
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| * | | | | | Merge branch 'jx/zh_CN-proposed' of github.com:jiangxin/gitJiang Xin2017-10-241-2414/+2557
| |\ \ \ \ \ \
| | * | | | | | l10n: zh_CN: review for git v2.15.0 l10n round 2Ray Chen2017-10-241-2/+2
| | * | | | | | l10n: zh_CN: for git v2.15.0 l10n round 2Jiang Xin2017-10-241-2414/+2557
| |/ / / / / /
| * | | | | | Merge branch 'master' of https://github.com/ralfth/git-po-deJiang Xin2017-10-241-2448/+2630
| |\ \ \ \ \ \
| | * | | | | | l10n: de.po: fix typosAndre Hinrichs2017-10-231-14/+14
| | * | | | | | l10n: de.po: translate 70 new messagesRalf Thielow2017-10-231-2435/+2617
| |/ / / / / /
| * | | | | | l10n: ru.po: update Russian translationDimitriy Ryazantcev2017-10-221-50/+50
| * | | | | | Merge branch 'master' of https://github.com/vnwildman/gitJiang Xin2017-10-221-51/+55
| |\ \ \ \ \ \
| | * | | | | | l10n: vi.po(3245t): Updated Vietnamese translation for v2.15.0 round 2Tran Ngoc Quan2017-10-191-51/+55
| * | | | | | | Merge branch 'l10n_fr_v2.15.0r2' of git://github.com/jnavila/gitJiang Xin2017-10-191-2427/+2612
| |\ \ \ \ \ \ \
| | * | | | | | | l10n: fr.po: v2.15.0 round 2Jean-Noel Avila2017-10-181-2424/+2612
| | * | | | | | | l10n: fr.po change translation of "First, rewinding"Nicolas Cornu2017-10-181-2/+1
| | * | | | | | | l10n: fr.po fix some mistakesJean-Noel Avila2017-10-181-7/+5
| | |/ / / / / /
| * | | | | | | Merge branch 'master' of git://github.com/nafmo/git-l10n-svJiang Xin2017-10-191-55/+58
| |\ \ \ \ \ \ \
| | * | | | | | | l10n: sv.po: Update Swedish translation (3245t0f0u)Peter Krefting2017-10-181-55/+58
| | |/ / / / / /
| * | | | | | | Merge branch 'master' of https://github.com/Softcatala/git-poJiang Xin2017-10-191-3008/+2991
| |\ \ \ \ \ \ \
| | * | | | | | | l10n: Update Catalan translationJordi Mas2017-10-171-3008/+2991
| | |/ / / / / /
| * | | | | | | Merge branch 'translation' of https://github.com/ChrisADR/git-poJiang Xin2017-10-191-50/+54
| |\ \ \ \ \ \ \
| | * | | | | | | l10n: es.po: v2.15.0 round 2Christopher Díaz Riveros2017-10-161-50/+54
| | |/ / / / / /
| * | | | | | | l10n: ko.po: Update Korean translationChangwoo Ryu2017-10-171-2411/+2535
| |/ / / / / /
| * | | | | | l10n: git.pot: v2.15.0 round 2 (2 new, 2 removed)Jiang Xin2017-10-171-47/+48
| * | | | | | Merge branch 'master' of git://github.com/git-l10n/git-poJiang Xin2017-10-177-12060/+29445
| |\ \ \ \ \ \
| | * | | | | | l10n: ru.po: update Russian translationDimitriy Ryazantcev2017-10-151-2381/+2521
| | * | | | | | Merge branch 'master' of git://github.com/alshopov/git-poJiang Xin2017-10-141-2419/+2554
| | |\ \ \ \ \ \
| | | * | | | | | l10n: bg.po: Updated Bulgarian translation (3245t)Alexander Shopov2017-10-141-2419/+2554
| | * | | | | | | l10n: sv.po: Update Swedish translation (3245t0f0u)Peter Krefting2017-10-111-2475/+2674
| | |/ / / / / /
| | * | | | | | Merge branch 'master' of https://github.com/vnwildman/gitJiang Xin2017-10-111-2425/+2598
| | |\ \ \ \ \ \
| | | * | | | | | l10n: vi.po(3245t): Updated Vietnamese translation for v2.15.0Tran Ngoc Quan2017-10-091-2425/+2598
| | * | | | | | | l10n: es.po: Update translation v2.15.0 round 1Christopher Díaz2017-10-081-2732/+3574
| | |/ / / / / /
| | * | | | | | Merge branch 'maint' of git://github.com/git-l10n/git-poJiang Xin2017-10-082-0/+15757
| | |\ \ \ \ \ \
| | | * | | | | | l10n: es.po: spanish added to TEAMSChristopher Díaz2017-08-271-0/+4