summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Git 2.18v2.18.0Junio C Hamano2018-06-211-1/+1
* Merge branch 'en/rename-directory-detection-reboot'Junio C Hamano2018-06-190-0/+0
|\
| * merge-recursive: use xstrdup() instead of fixed bufferRené Scharfe2018-06-181-5/+5
* | Merge tag 'l10n-2.18.0-rnd3.1' of git://github.com/git-l10n/git-poJunio C Hamano2018-06-192-2522/+3541
|\ \
| * | l10n: ko.po: Update Korean translationChangwoo Ryu2018-06-192-2522/+3541
* | | Merge branch 'cf/submodule-progress-dissociate'Junio C Hamano2018-06-191-2/+4
|\ \ \
| * | | t7400: encapsulate setup code in test_expect_successStefan Beller2018-06-191-2/+4
* | | | Merge branch 'js/rebase-i-root-fix'Junio C Hamano2018-06-191-1/+2
|\ \ \ \
| * | | | t3404: check root commit in 'rebase -i --root reword root commit'Todd Zullinger2018-06-191-1/+2
* | | | | doc: fix typos in documentation and release notesKarthikeyan Singaravelan2018-06-194-4/+4
* | | | | Almost 2.18 finalJunio C Hamano2018-06-181-0/+11
* | | | | Merge branch 'es/make-no-iconv'Junio C Hamano2018-06-181-10/+12
|\ \ \ \ \
| * | | | | Makefile: make NO_ICONV really mean "no iconv"Eric Sunshine2018-06-151-10/+12
* | | | | | Merge branch 'sg/t7406-chain-fix'Junio C Hamano2018-06-181-6/+6
|\ \ \ \ \ \
| * | | | | | t7406-submodule-update: fix broken &&-chainsSZEDER Gábor2018-06-181-6/+6
| |/ / / / /
* | | | | | Merge branch 'ks/branch-set-upstream'Junio C Hamano2018-06-181-1/+1
|\ \ \ \ \ \
| * | | | | | t3200: clarify description of --set-upstream testKaartic Sivaraam2018-06-181-1/+1
* | | | | | | Merge branch 'js/rebase-i-root-fix'Junio C Hamano2018-06-182-1/+10
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| * | | | | | rebase --root: fix amending root commit messagesJohannes Schindelin2018-06-182-2/+2
| * | | | | | rebase --root: demonstrate a bug while amending root commit messagesTodd Zullinger2018-06-181-0/+9
* | | | | | | Merge branch 'jk/ewah-bounds-check'Junio C Hamano2018-06-185-7/+38
|\ \ \ \ \ \ \
| * | | | | | | ewah: adjust callers of ewah_read_mmap()Jeff King2018-06-182-2/+3
| * | | | | | | ewah_read_mmap: bounds-check mmap readsJeff King2018-06-183-5/+35
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge tag 'l10n-2.18.0-rnd3' of git://github.com/git-l10n/git-poJunio C Hamano2018-06-1810-17929/+26095
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |
| * | | | | | l10n: zh_CN: for git v2.18.0 l10n round 1 to 3Jiang Xin2018-06-181-2452/+3552
| * | | | | | Merge branch 'master' of git://github.com/nafmo/git-l10n-svJiang Xin2018-06-171-2453/+3562
| |\ \ \ \ \ \
| | * | | | | | l10n: sv.po: Update Swedish translation (3608t0f0u)Peter Krefting2018-06-081-428/+981
| | * | | | | | l10n: sv.po: Update Swedish translation (3470t0f0u)Peter Krefting2018-06-081-2296/+2852
| * | | | | | | Merge branch 'master' of https://github.com/vnwildman/gitJiang Xin2018-06-171-21/+21
| |\ \ \ \ \ \ \
| | * | | | | | | l10n: vi.po(3608t): Update Vietnamese translation for v2.18.0 round 3Tran Ngoc Quan2018-06-171-21/+21
| * | | | | | | | Merge branch 'master' of git://github.com/alshopov/git-poJiang Xin2018-06-171-19/+19
| |\ \ \ \ \ \ \ \
| | * | | | | | | | l10n: bg.po: Updated Bulgarian translation (3608t)Alexander Shopov2018-06-171-19/+19
| | |/ / / / / / /
| * | | | | | | | Merge branch 'fr_2.18_rnd3' of git://github.com/jnavila/gitJiang Xin2018-06-171-466/+1071
| |\ \ \ \ \ \ \ \
| | * | | | | | | | l10n: fr.po v2.18.0 round 3Jean-Noël Avila2018-06-161-466/+1071
| | |/ / / / / / /
| * / / / / / / / l10n: es.po: Spanish update for v2.18.0 round 3Christopher Diaz Riveros2018-06-161-20/+20
| |/ / / / / / /
| * | | | | | | l10n: git.pot: v2.18.0 round 3 (1 new, 1 removed)Jiang Xin2018-06-161-17/+17
| * | | | | | | Merge branch 'master' of git://github.com/git-l10n/git-poJiang Xin2018-06-168-12862/+18214
| |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ Merge branch 'master' of https://github.com/vnwildman/gitJiang Xin2018-06-151-430/+994
| | |\ \ \ \ \ \ \
| | | * | | | | | | l10n: vi.po(3608t): Update Vietnamese translation for v2.18.0 round2Tran Ngoc Quan2018-06-141-430/+994
| | * | | | | | | | l10n: bg.po: Updated Bulgarian translation (3608t)Alexander Shopov2018-06-121-2463/+3598
| | |/ / / / / / /
| | * / / / / / / l10n: es.po: Spanish update for v2.18.0 round 2Christopher Diaz Riveros2018-06-101-422/+994
| | |/ / / / / /
| | * | | | | | l10n: git.pot: v2.18.0 round 2 (144 new, 6 removed)Jiang Xin2018-06-081-409/+962
| | * | | | | | Merge branch 'master' of git://github.com/git-l10n/git-poJiang Xin2018-06-087-9951/+12479
| | |\ \ \ \ \ \
| | | * \ \ \ \ \ Merge branch 'fr_2.18_round1' of git://github.com/jnavila/gitJiang Xin2018-06-041-2317/+2889
| | | |\ \ \ \ \ \
| | | | * | | | | | l10n: fr.po v2.18 round 1Jean-Noël Avila2018-06-031-2317/+2889
| | | * | | | | | | l10n: vi(3470t): Updated Vietnamese translation for v2.18.0Tran Ngoc Quan2018-06-031-2298/+2863
| | | * | | | | | | l10n: es.po: Spanish update for v2.18.0 round 1Christopher Diaz Riveros2018-06-021-2360/+2918
| | | |/ / / / / /
| | | * | | | | | l10n: git.pot: v2.18.0 round 1 (108 new, 14 removed)Jiang Xin2018-05-311-2259/+2739
| | | * | | | | | Merge remote-tracking branch 'git-po/maint'Jiang Xin2018-05-313-717/+1070
| | | |\ \ \ \ \ \
| | | | * \ \ \ \ \ Merge branch 'master' of https://github.com/ralfth/git-po-de into maintJiang Xin2018-04-151-2/+2
| | | | |\ \ \ \ \ \