summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* branch doc: update description for `--list`ab/branch-list-docJunio C Hamano2017-03-241-2/+7
* branch doc: change `git branch <pattern>` to use `<branchname>`Ævar Arnfjörð Bjarmason2017-03-231-1/+1
* Prepare for 2.12.2Junio C Hamano2017-03-212-1/+62
* Merge branch 'jh/send-email-one-cc' into maintJunio C Hamano2017-03-212-5/+4
|\
| * send-email: only allow one address per body tagjh/send-email-one-ccJohan Hovold2017-02-272-5/+4
* | Merge branch 'jk/t6300-cleanup' into maintJunio C Hamano2017-03-211-1/+1
|\ \
| * | t6300: avoid creating refs/heads/HEADjk/t6300-cleanupJeff King2017-02-271-1/+1
| |/
* | Merge branch 'rs/commit-parsing-optim' into maintJunio C Hamano2017-03-211-12/+10
|\ \
| * | commit: don't check for space twice when looking for headerrs/commit-parsing-optimRené Scharfe2017-02-271-10/+8
| * | commit: be more precise when searching for headersRené Scharfe2017-02-271-2/+2
* | | Merge branch 'jk/show-branch-lift-name-len-limit' into maintJunio C Hamano2017-03-211-29/+13
|\ \ \
| * | | show-branch: use skip_prefix to drop magic numbersjk/show-branch-lift-name-len-limitJeff King2017-02-151-11/+8
| * | | show-branch: store resolved head in heap bufferJeff King2017-02-141-14/+5
| * | | show-branch: drop head_len variableJeff King2017-02-141-6/+2
| |/ /
* | | Merge branch 'jk/tempfile-ferror-fclose-confusion' into maintJunio C Hamano2017-03-211-2/+7
|\ \ \
| * | | tempfile: set errno to a known value before calling ferror()jk/tempfile-ferror-fclose-confusionJeff King2017-02-171-2/+7
* | | | Merge branch 'rl/remote-allow-missing-branch-name-merge' into maintJunio C Hamano2017-03-212-1/+22
|\ \ \ \
| * | | | remote: ignore failure to remove missing branch.<name>.mergerl/remote-allow-missing-branch-name-mergeRoss Lagerwall2017-02-212-1/+22
| | |_|/ | |/| |
* | | | Merge branch 'dt/gc-ignore-old-gc-logs' into maintJunio C Hamano2017-03-213-7/+71
|\ \ \ \
| * | | | 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
| | |_|/ / / / | |/| | | | |