summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* string list: improve commentsb/string-list-split-appendsStefan Beller2016-05-191-1/+1
* Git 2.8.3v2.8.3Junio C Hamano2016-05-184-5/+37
* Merge branch 'sb/misc-cleanups' into HEADJunio C Hamano2016-05-186-21/+29
|\
| * submodule-config: don't shadow `cache`sb/misc-cleanupsStefan Beller2016-04-281-6/+6
| * config.c: drop local variableStefan Beller2016-04-281-4/+1
| * credential-cache, send_request: close fd when doneStefan Beller2016-04-011-0/+1
| * bundle: don't leak an fd in case of early returnStefan Beller2016-04-011-6/+17
| * abbrev_sha1_in_line: don't leak memoryStefan Beller2016-04-011-3/+1
| * notes: don't leak memory in git_config_get_notes_strategyStefan Beller2016-04-011-2/+3
* | Merge branch 'ew/doc-split-pack-disables-bitmap' into HEADJunio C Hamano2016-05-184-9/+23
|\ \
| * | pack-objects: warn on split packs disabling bitmapsew/doc-split-pack-disables-bitmapEric Wong2016-04-284-9/+23
* | | Merge branch 'sb/clean-test-fix' into HEADJunio C Hamano2016-05-181-1/+1
|\ \ \
| * | | t7300: mark test with SANITYsb/clean-test-fixStefan Beller2016-05-031-1/+1
* | | | Merge branch 'rn/glossary-typofix' into HEADJunio C Hamano2016-05-181-1/+1
|\ \ \ \
| * | | | Documentation: fix typo 'In such these cases'rn/glossary-typofixRené Nyffenegger2016-05-021-1/+1
* | | | | Merge branch 'ew/normal-to-e' into HEADJunio C Hamano2016-05-181-0/+1
|\ \ \ \ \
| * | | | | .mailmap: update to my shorter email addressew/normal-to-eEric Wong2016-05-021-0/+1
* | | | | | Merge branch 'sb/config-exit-status-list' into HEADJunio C Hamano2016-05-181-3/+3
|\ \ \ \ \ \
| * | | | | | config doc: improve exit code listingsb/config-exit-status-listStefan Beller2016-04-261-3/+3
| | |_|_|/ / | |/| | | |
* | | | | | Merge branch 'rt/string-list-lookup-cleanup' into HEADJunio C Hamano2016-05-181-4/+4
|\ \ \ \ \ \
| * | | | | | string_list: use string-list API in unsorted_string_list_lookup()rt/string-list-lookup-cleanupRalf Thielow2016-04-251-4/+4
* | | | | | | Merge branch 'jk/fix-attribute-macro-in-2.5' into HEADJunio C Hamano2016-05-181-1/+1
|\ \ \ \ \ \ \
| * | | | | | | remote.c: spell __attribute__ correctlyjk/fix-attribute-macro-in-2.5Jeff King2016-04-251-1/+1
* | | | | | | | Merge branch 'sg/test-lib-simplify-expr-away' into HEADJunio C Hamano2016-05-181-5/+5
|\ \ \ \ \ \ \ \
| * | | | | | | | test-lib: simplify '--option=value' parsingsg/test-lib-simplify-expr-awaySZEDER Gábor2016-04-221-5/+5
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge branch 'nd/remove-unused' into HEADJunio C Hamano2016-05-184-27/+0
|\ \ \ \ \ \ \ \
| * | | | | | | | wrapper.c: delete dead function git_mkstemps()nd/remove-unusedNguyễn Thái Ngọc Duy2016-04-222-19/+0
| * | | | | | | | dir.c: remove dead function fnmatch_icase()Nguyễn Thái Ngọc Duy2016-04-222-8/+0
| |/ / / / / / /
* | | | | | | | Merge branch 'sk/gitweb-highlight-encoding' into HEADJunio C Hamano2016-05-181-0/+3
|\ \ \ \ \ \ \ \
| * | | | | | | | gitweb: apply fallback encoding before highlightsk/gitweb-highlight-encodingShin Kojima2016-05-031-0/+3
* | | | | | | | | Merge branch 'ls/travis-submitting-patches' into HEADJunio C Hamano2016-05-181-17/+63
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Documentation: add setup instructions for Travis CIls/travis-submitting-patchesLars Schneider2016-05-021-17/+63
* | | | | | | | | | Merge branch 'js/close-packs-before-gc' into HEADJunio C Hamano2016-05-181-0/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | t5510: run auto-gc in the foregroundjs/close-packs-before-gcSZEDER Gábor2016-05-021-0/+1
* | | | | | | | | | | Merge branch 'ls/p4-lfs' into HEADJunio C Hamano2016-05-183-10/+24
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | git-p4: fix Git LFS pointer parsingLars Schneider2016-04-282-3/+14
| * | | | | | | | | | | travis-ci: express Linux/OS X dependency versions more clearlyLars Schneider2016-04-281-7/+10
| * | | | | | | | | | | travis-ci: update Git-LFS and P4 to the latest versionLars Schneider2016-04-191-2/+2
* | | | | | | | | | | | Merge branch 'ls/p4-lfs-test-fix-2.7.0' into HEADJunio C Hamano2016-05-181-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | t9824: fix wrong reference valuels/p4-lfs-test-fix-2.7.0Lars Schneider2016-04-291-1/+1
| * | | | | | | | | | | | t9824: fix broken &&-chain in a subshellSZEDER Gábor2016-04-241-1/+1
* | | | | | | | | | | | | Merge branch 'nf/mergetool-prompt' into HEADJunio C Hamano2016-05-184-5/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | difftool/mergetool: make the form of yes/no questions consistentnf/mergetool-promptNikola Forró2016-04-254-5/+5
| | |_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'jd/send-email-to-whom' into HEADJunio C Hamano2016-05-181-2/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | send-email: fix grammo in the prompt that asks e-mail recipientsjd/send-email-to-whomJunio C Hamano2016-04-251-2/+3
| | |_|_|_|_|/ / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'js/win32-mmap' into HEADJunio C Hamano2016-05-181-13/+18
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | mmap(win32): avoid expensive fstat() calljs/win32-mmapJohannes Schindelin2016-04-221-9/+7
| * | | | | | | | | | | | | mmap(win32): avoid copy-on-write when it is unnecessaryJohannes Schindelin2016-04-221-2/+3
| * | | | | | | | | | | | | win32mmap: set errno appropriatelyJohannes Schindelin2016-04-221-2/+8
| | |_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'jk/push-client-deadlock-fix' into HEADJunio C Hamano2016-05-187-11/+29
|\ \ \ \ \ \ \ \ \ \ \ \ \