summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* p4211: explicitly disable renames in no-rename testjk/perf-any-versionJeff King2016-06-221-3/+3
* t/perf: fix regression in testing older versions of gitJeff King2016-06-222-3/+14
* perf: make the tests work in worktreesJohannes Schindelin2016-05-131-7/+7
* perf: let's disable symlinks when they are not availableJohannes Schindelin2016-05-131-1/+4
* Eleventh batch for 2.9Junio C Hamano2016-05-101-0/+21
* Merge branch 'svn/bad-ref' of git://bogomips.org/git-svnJunio C Hamano2016-05-101-1/+2
|\
| * Git/SVN: die when there is no commit metadataChristian Couder2016-05-081-1/+2
* | Merge branch 'sk/gitweb-highlight-encoding'Junio C Hamano2016-05-101-0/+3
|\ \
| * | gitweb: apply fallback encoding before highlightsk/gitweb-highlight-encodingShin Kojima2016-05-031-0/+3
* | | Merge branch 'sb/clean-test-fix'Junio C Hamano2016-05-101-1/+1
|\ \ \
| * | | t7300: mark test with SANITYsb/clean-test-fixStefan Beller2016-05-031-1/+1
* | | | Merge branch 'rn/glossary-typofix'Junio C Hamano2016-05-101-1/+1
|\ \ \ \
| * | | | Documentation: fix typo 'In such these cases'rn/glossary-typofixRené Nyffenegger2016-05-021-1/+1
* | | | | Merge branch 'ls/travis-submitting-patches'Junio C Hamano2016-05-101-17/+63
|\ \ \ \ \
| * | | | | Documentation: add setup instructions for Travis CIls/travis-submitting-patchesLars Schneider2016-05-021-17/+63
* | | | | | Merge branch 'js/close-packs-before-gc'Junio C Hamano2016-05-101-0/+1
|\ \ \ \ \ \
| * | | | | | t5510: run auto-gc in the foregroundjs/close-packs-before-gcSZEDER Gábor2016-05-021-0/+1
* | | | | | | Merge branch 'ew/normal-to-e'Junio C Hamano2016-05-101-0/+1
|\ \ \ \ \ \ \
| * | | | | | | .mailmap: update to my shorter email addressew/normal-to-eEric Wong2016-05-021-0/+1
* | | | | | | | Merge branch 'ls/p4-lfs'Junio C Hamano2016-05-103-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 'sb/misc-cleanups'Junio C Hamano2016-05-102-10/+7
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | submodule-config: don't shadow `cache`sb/misc-cleanupsStefan Beller2016-04-281-6/+6
| * | | | | | | | | config.c: drop local variableStefan Beller2016-04-281-4/+1
* | | | | | | | | | Merge branch 'ew/doc-split-pack-disables-bitmap'Junio C Hamano2016-05-104-9/+23
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ |/| | | | | | | | |
| * | | | | | | | | pack-objects: warn on split packs disabling bitmapsew/doc-split-pack-disables-bitmapEric Wong2016-04-284-9/+23
* | | | | | | | | | Sync with maintJunio C Hamano2016-05-061-0/+9
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Almost ready for 2.8.3Junio C Hamano2016-05-061-0/+9
| * | | | | | | | | | Merge branch 'sb/submodule-path-misc-bugs' into maintJunio C Hamano2016-05-063-11/+133
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'ky/imap-send-openssl-1.1.0' into maintJunio C Hamano2016-05-065-28/+21
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'js/replace-edit-use-editor-configuration' into maintJunio C Hamano2016-05-061-0/+1
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'cc/apply' into maintJunio C Hamano2016-05-061-15/+15
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'kn/for-each-tag-branch' into maintJunio C Hamano2016-05-061-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | | | | | | Tenth batch for 2.9Junio C Hamano2016-05-061-2/+30
* | | | | | | | | | | | | | | | Merge branch 'jk/diff-compact-heuristic'Junio C Hamano2016-05-063-4/+49
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | diff: undocument the compaction heuristic knobs for experimentationJunio C Hamano2016-05-022-11/+0
| * | | | | | | | | | | | | | | | xdiff: implement empty line chunk heuristicStefan Beller2016-04-195-0/+50
| * | | | | | | | | | | | | | | | xdiff: add recs_match helper functionJacob Keller2016-04-181-4/+10
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge branch 'ls/p4-lfs-test-fix-2.7.0'Junio C Hamano2016-05-061-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 'bc/object-id'Junio C Hamano2016-05-0621-98/+109
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | match-trees: convert several leaf functions to use struct object_idbrian m. carlson2016-04-251-15/+15
| * | | | | | | | | | | | | | | | | tree-walk: convert tree_entry_extract() to use struct object_idbrian m. carlson2016-04-255-17/+17
| * | | | | | | | | | | | | | | | | struct name_entry: use struct object_id instead of unsigned char sha1[20]brian m. carlson2016-04-2517-48/+48
| * | | | | | | | | | | | | | | | | match-trees: convert shift_tree() and shift_tree_by() to use object_idbrian m. carlson2016-04-194-27/+27
| * | | | | | | | | | | | | | | | | test-match-trees: convert to use struct object_idbrian m. carlson2016-04-191-7/+7
| * | | | | | | | | | | | | | | | | sha1-name: introduce a get_oid() functionbrian m. carlson2016-04-192-0/+11