summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | gc: ignore old gc.log filesDavid Turner2017-02-133-7/+71
| |/ / / / / / /
* | | | | | | | Merge branch 'jt/upload-pack-error-report' into maintJunio C Hamano2017-03-211-1/+5
|\ \ \ \ \ \ \ \
| * | | | | | | | upload-pack: report "not our ref" to clientjt/upload-pack-error-reportJonathan Tan2017-02-231-1/+5
| |/ / / / / / /
* | | | | | | | Merge branch 'rs/sha1-file-plug-fallback-base-leak' into maintJunio C Hamano2017-03-211-0/+4
|\ \ \ \ \ \ \ \
| * | | | | | | | sha1_file: release fallback base's memory in unpack_entry()rs/sha1-file-plug-fallback-base-leakRené Scharfe2017-02-271-0/+4
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Merge branch 'ss/remote-bzr-hg-placeholder-wo-python' into maintJunio C Hamano2017-03-212-18/+14
|\ \ \ \ \ \ \ \
| * | | | | | | | contrib: git-remote-{bzr,hg} placeholders don't need Pythonss/remote-bzr-hg-placeholder-wo-pythonSebastian Schuberth2017-03-032-18/+14
* | | | | | | | | Merge branch 'jc/diff-populate-filespec-size-only-fix' into maintJunio C Hamano2017-03-212-1/+27
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | diff: do not short-cut CHECK_SIZE_ONLY check in diff_populate_filespec()jc/diff-populate-filespec-size-only-fixJunio C Hamano2017-03-022-1/+27
* | | | | | | | | | Merge branch 'jk/http-walker-buffer-underflow-fix' into maintJunio C Hamano2017-03-211-4/+7
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | http-walker: fix buffer underflow processing remote alternatesjk/http-walker-buffer-underflow-fixJeff King2017-03-131-4/+7
| | |/ / / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'mg/status-porcelain-no-i18n' into maintJunio C Hamano2017-03-211-4/+4
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | git-status: make porcelain more robustmg/status-porcelain-no-i18nMichael J Gruber2017-03-141-4/+4
| | |_|/ / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'ps/docs-diffcore' into maintJunio C Hamano2017-03-211-5/+5
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | docs/diffcore: unquote "Complete Rewrites" in headersps/docs-diffcorePatrick Steinhardt2017-02-281-4/+4
| * | | | | | | | | | docs/diffcore: fix grammar in diffcore-rename headerPatrick Steinhardt2017-02-281-1/+1
| | |/ / / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'ew/markdown-url-in-readme' into maintJunio C Hamano2017-03-211-3/+3
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | README: create HTTP/HTTPS links from URLs in Markdownew/markdown-url-in-readmeEric Wong2017-03-011-3/+3
| | |_|_|/ / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'rj/remove-unused-mktemp' into maintJunio C Hamano2017-03-216-60/+0
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | wrapper.c: remove unused gitmkstemps() functionrj/remove-unused-mktempRamsay Jones2017-02-285-40/+0
| * | | | | | | | | | wrapper.c: remove unused git_mkstemp() functionRamsay Jones2017-02-282-20/+0
| | |/ / / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'jk/ewah-use-right-type-in-sizeof' into maintJunio C Hamano2017-03-211-2/+2
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | ewah: fix eword_t/uint64_t confusionjk/ewah-use-right-type-in-sizeofJeff King2017-03-061-2/+2
* | | | | | | | | | | Git 2.12.1v2.12.1Junio C Hamano2017-03-201-1/+2
| |_|_|_|_|_|_|_|_|/ |/| | | | | | | | |
* | | | | | | | | | 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
|\ \ \ \ \ \ \ \ \