summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* wt-status: simplify by using for_each_string_list_itemsb/wt-status-cleanupStefan Beller2017-03-171-15/+5
* Preparing for 2.12.1Junio C Hamano2017-03-163-2/+43
* Merge branch 'js/realpath-pathdup-fix' into maintJunio C Hamano2017-03-1610-18/+26
|\
| * real_pathdup(): fix callsites that wanted it to die on errorjs/realpath-pathdup-fixJohannes Schindelin2017-03-089-18/+18
| * t1501: demonstrate NULL pointer access with invalid GIT_WORK_TREEJohannes Schindelin2017-03-081-0/+8
* | Merge branch 'mm/two-more-xstrfmt' into maintJunio C Hamano2017-03-162-11/+9
|\ \
| * | bisect_next_all: convert xsnprintf to xstrfmtmm/two-more-xstrfmtMaxim Moseychuk2017-02-161-4/+5
| * | stop_progress_msg: convert xsnprintf to xstrfmtMaxim Moseychuk2017-02-161-7/+4
* | | Merge branch 'vn/line-log-memcpy-size-fix' into maintJunio C Hamano2017-03-161-1/+2
|\ \ \
| * | | line-log: use COPY_ARRAY to fix mis-sized memcpyvn/line-log-memcpy-size-fixVegard Nossum2017-03-061-1/+2
* | | | Merge branch 'ax/line-log-range-merge-fix' into maintJunio C Hamano2017-03-162-8/+17
|\ \ \ \
| * | | | line-log.c: prevent crash during union of too many rangesax/line-log-range-merge-fixAllan Xavier2017-03-032-8/+17
| |/ / /
* | | | Merge branch 'jk/add-i-patch-do-prompt' into maintJunio C Hamano2017-03-162-4/+22
|\ \ \ \
| * | | | add--interactive: fix missing file prompt for patch mode with "-i"jk/add-i-patch-do-promptJeff King2017-03-022-4/+22
| | |_|/ | |/| |
* | | | Merge branch 'jt/http-base-url-update-upon-redirect' into maintJunio C Hamano2017-03-163-0/+21
|\ \ \ \
| * | | | http: attempt updating base URL only if no errorjt/http-base-url-update-upon-redirectJonathan Tan2017-02-283-0/+21
| |/ / /
* | | | Merge branch 'js/travis-32bit-linux' into maintJunio C Hamano2017-03-162-0/+51
|\ \ \ \
| * | | | Travis: also test on 32-bit Linuxjs/travis-32bit-linuxJohannes Schindelin2017-03-062-0/+51
| | |_|/ | |/| |
* | | | Merge branch 'jh/mingw-openssl-sha1' into maintJunio C Hamano2017-03-161-1/+0
|\ \ \ \
| * | | | mingw: use OpenSSL's SHA-1 routinesjh/mingw-openssl-sha1Jeff Hostetler2017-02-091-1/+0
| |/ / /
* | | | Merge branch 'jk/http-auth' into maintJunio C Hamano2017-03-161-4/+46
|\ \ \ \ | |_|/ / |/| | |
| * | | http: add an "auto" mode for http.emptyauthjk/http-authJeff King2017-02-271-5/+45
| * | | http: restrict auth methods to what the server advertisesJeff King2017-02-231-0/+2
| |/ /
* | | Git 2.12v2.12.0Junio C Hamano2017-02-243-1/+12
* | | Merge branch 'ps/doc-gc-aggressive-depth-update'Junio C Hamano2017-02-241-1/+1
|\ \ \
| * | | docs/git-gc: fix default value for `--aggressiveDepth`ps/doc-gc-aggressive-depth-updatePatrick Steinhardt2017-02-241-1/+1
| |/ /
* | | Merge branch 'bc/worktree-doc-fix-detached'Junio C Hamano2017-02-241-1/+1
|\ \ \
| * | | Documentation: correctly spell git worktree --detachbc/worktree-doc-fix-detachedbrian m. carlson2017-02-221-1/+1
* | | | Merge branch 'dr/doc-check-ref-format-normalize'Junio C Hamano2017-02-241-3/+3
|\ \ \ \
| * | | | git-check-ref-format: clarify documentation for --normalizedr/doc-check-ref-format-normalizeDamien Regad2017-02-211-3/+3
| | |/ / | |/| |
* | | | Merge branch 'gp/document-dotfiles-in-templates-are-not-copied'Junio C Hamano2017-02-241-2/+2
|\ \ \ \
| * | | | init: document dotfiles exclusion on template copygp/document-dotfiles-in-templates-are-not-copiedGrégoire Paris2017-02-171-2/+2
| |/ / /
* | | | Merge branch 'rt/align-add-i-help-text'Junio C Hamano2017-02-241-1/+1
|\ \ \ \
| * | | | git add -i: replace \t with blanks in the help messagert/align-add-i-help-textRalf Thielow2017-02-221-1/+1
* | | | | Merge branch 'bc/blame-doc-fix'Junio C Hamano2017-02-241-2/+2
|\ \ \ \ \
| * | | | | Documentation: use brackets for optional argumentsbc/blame-doc-fixbrian m. carlson2017-02-221-2/+2
| |/ / / /
* | | | | Merge tag 'l10n-2.12.0-rnd2' of git://github.com/git-l10n/git-poJunio C Hamano2017-02-2411-16381/+30174
|\ \ \ \ \
| * | | | | l10n: zh_CN: for git v2.12.0 l10n round 2Jiang Xin2017-02-251-1446/+2761
| * | | | | l10n: Update Catalan translationJordi Mas2017-02-251-280/+340
| * | | | | l10n: pt_PT: update Portuguese tranlationVasco Almeida2017-02-231-1634/+2928
| * | | | | Merge branch 'master' of git://github.com/nafmo/git-l10n-svJiang Xin2017-02-221-168/+176
| |\ \ \ \ \
| | * | | | | l10n: sv.po: Update Swedish translation (3139t0f0u)Peter Krefting2017-02-201-168/+176
| * | | | | | l10n: de.po: translate 241 messagesRalf Thielow2017-02-201-1472/+2859
| |/ / / / /
| * | | | | Merge branch 'ko/merge-l10n' of https://github.com/changwoo/git-l10n-koJiang Xin2017-02-191-178/+200
| |\ \ \ \ \
| | * | | | | l10n: ko.po: Update Korean translationChangwoo Ryu2017-02-191-178/+200
| * | | | | | Merge branch 'master' of https://github.com/vnwildman/gitJiang Xin2017-02-191-169/+177
| |\ \ \ \ \ \
| | * | | | | | l10n: vi.po (3139t): Updated 2 new messages for rc1Tran Ngoc Quan2017-02-181-169/+177
| | |/ / / / /
| * | | | | | l10n: fr.po: v2.12.0 round 2 3139tJean-Noel Avila2017-02-181-192/+234
| |/ / / / /
| * | | | | l10n: git.pot: v2.12.0 round 2 (2 new)Jiang Xin2017-02-181-167/+175
| * | | | | Merge branch 'master' of git://github.com/git-l10n/git-poJiang Xin2017-02-189-11031/+20680
| |\ \ \ \ \