summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | Merge branch 'jc/abbrev-autoscale-config' into maintJunio C Hamano2017-01-312-8/+15
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | config.abbrev: document the new default that auto-scalesjc/abbrev-autoscale-configJunio C Hamano2016-12-222-8/+15
* | | | | | | | | | Merge branch 'mh/fast-import-notes-fix-new' into maintJunio C Hamano2017-01-312-3/+47
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | fast-import: properly fanout notes when tree is importedmh/fast-import-notes-fix-newMike Hommey2016-12-202-3/+47
| | |_|_|_|_|_|/ / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'jc/compression-config' into maintJunio C Hamano2017-01-319-31/+158
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | compression: unify pack.compression configuration parsingjc/compression-configJunio C Hamano2016-11-159-31/+158
* | | | | | | | | | | Merge branch 'ew/svn-fixes' into maintJunio C Hamano2017-01-312-2/+8
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | git-svn: document useLogAuthor and addAuthorFrom config keysew/svn-fixesEric Wong2016-12-121-1/+7
| * | | | | | | | | | | git-svn: allow "0" in SVN path componentsEric Wong2016-12-121-1/+1
| | |/ / / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'ls/travis-p4-on-macos' into maintJunio C Hamano2017-01-311-10/+2
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | travis-ci: fix Perforce install on macOSls/travis-p4-on-macosLars Schneider2017-01-231-10/+2
| | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'jk/make-tags-find-sources-tweak' into maintJunio C Hamano2017-01-311-3/+16
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Makefile: exclude contrib from FIND_SOURCE_FILESjk/make-tags-find-sources-tweakJeff King2016-12-141-0/+2
| * | | | | | | | | | | Makefile: match shell scripts in FIND_SOURCE_FILESJeff King2016-12-141-1/+3
| * | | | | | | | | | | Makefile: exclude test cruft from FIND_SOURCE_FILESJeff King2016-12-141-1/+7
| * | | | | | | | | | | Makefile: reformat FIND_SOURCE_FILESJeff King2016-12-141-3/+6
* | | | | | | | | | | | Merge branch 'jc/latin-1' into maintJunio C Hamano2017-01-311-11/+25
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | utf8: accept "latin-1" as ISO-8859-1jc/latin-1Junio C Hamano2016-09-261-0/+7
| * | | | | | | | | | | utf8: refactor code to decide fallback encodingJunio C Hamano2016-09-261-11/+18
| | |_|_|_|_|_|/ / / / | |/| | | | | | | | |
* | | | | | | | | | | Almost ready for 2.11.1Junio C Hamano2017-01-174-3/+124
* | | | | | | | | | | Merge branch 'mm/gc-safety-doc' into maintJunio C Hamano2017-01-172-9/+29
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | git-gc.txt: expand discussion of races with other processesmm/gc-safety-docMatt McCutchen2016-11-162-9/+29
| |/ / / / / / / / / /
* | | | | | | | | | | Merge branch 'mm/push-social-engineering-attack-doc' into maintJunio C Hamano2017-01-176-22/+51
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | doc: mention transfer data leaks in more placesmm/push-social-engineering-attack-docMatt McCutchen2016-11-146-22/+51
| |/ / / / / / / / / /
* | | | | | | | | | | Merge branch 'jt/fetch-no-redundant-tag-fetch-map' into maintJunio C Hamano2017-01-171-3/+0
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | fetch: do not redundantly calculate tag refmapjt/fetch-no-redundant-tag-fetch-mapJonathan Tan2016-11-111-3/+0
| |/ / / / / / / / / /
* | | | | | | | | | | Merge branch 'ls/filter-process' into maintJunio C Hamano2017-01-174-29/+24
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | t0021: fix flaky testls/filter-processLars Schneider2016-12-181-16/+1
| * | | | | | | | | | | docs: warn about possible '=' in clean/smudge filter process valuesLars Schneider2016-12-064-15/+25
* | | | | | | | | | | | Merge branch 'kh/tutorial-grammofix' into maintJunio C Hamano2017-01-171-6/+6
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | doc: omit needless "for"kh/tutorial-grammofixKristoffer Haugsbakk2016-12-091-1/+1
| * | | | | | | | | | | | doc: make the intent of sentence clearerKristoffer Haugsbakk2016-12-091-1/+1
| * | | | | | | | | | | | doc: add verb in front of command to runKristoffer Haugsbakk2016-12-091-1/+1
| * | | | | | | | | | | | doc: add articles (grammar)Kristoffer Haugsbakk2016-12-091-3/+3
| | |_|_|_|_|_|/ / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'lr/doc-fix-cet' into maintJunio C Hamano2017-01-171-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | date-formats.txt: Typo fixlr/doc-fix-cetLuis Ressel2016-12-121-1/+1
| | |_|/ / / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'sb/t3600-cleanup' into maintJunio C Hamano2017-01-171-73/+51
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | t3600: slightly modernize stylesb/t3600-cleanupStefan Beller2016-12-121-73/+51
| * | | | | | | | | | | | t3600: remove useless redirectStefan Beller2016-12-051-1/+1
* | | | | | | | | | | | | Merge branch 'jk/readme-gmane-is-no-more' into maintJunio C Hamano2017-01-171-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | README: replace gmane link with public-inboxjk/readme-gmane-is-no-moreJeff King2016-12-151-1/+1
| | |_|/ / / / / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'sb/unpack-trees-grammofix' into maintJunio C Hamano2017-01-172-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | unpack-trees: fix grammar for untracked files in directoriessb/unpack-trees-grammofixStefan Beller2016-12-052-2/+2
* | | | | | | | | | | | | | Merge branch 'ls/t0021-fixup' into maintJunio C Hamano2017-01-171-3/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | t0021: minor filter process test cleanupls/t0021-fixupLars Schneider2016-12-051-3/+2
* | | | | | | | | | | | | | | Merge branch 'ak/lazy-prereq-mktemp' into maintJunio C Hamano2017-01-171-1/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | t7610: clean up foo.XXXXXX tmpdirak/lazy-prereq-mktempJeff King2016-11-291-1/+2
* | | | | | | | | | | | | | | | Merge branch 'nd/qsort-in-merge-recursive' into maintJunio C Hamano2017-01-171-9/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | merge-recursive.c: use string_list_sort instead of qsortnd/qsort-in-merge-recursiveNguyễn Thái Ngọc Duy2016-11-281-9/+7
* | | | | | | | | | | | | | | | | Merge branch 'dt/smart-http-detect-server-going-away' into maintJunio C Hamano2017-01-175-4/+77
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \