summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* sha1_file.c:create_tmpfile(): Fix race when creating loose object dirsjh/loose-object-dirs-creation-raceJohan Herland2013-10-281-1/+3
* Almost 1.8.4.2 ;-)Junio C Hamano2013-10-231-0/+13
* Merge branch 'jc/ls-files-killed-optim' into maintJunio C Hamano2013-10-234-17/+67
|\
| * dir.c::test_one_path(): work around directory_exists_in_index_icase() breakagejc/ls-files-killed-optimEric Sunshine2013-08-232-9/+24
| * t3010: update to demonstrate "ls-files -k" optimization pitfallsJunio C Hamano2013-08-151-3/+9
| * ls-files -k: a directory only can be killed if the index has a non-directoryJunio C Hamano2013-08-153-3/+31
| * dir.c: use the cache_* macro to access the current indexJunio C Hamano2013-08-151-6/+5
* | Merge branch 'jh/checkout-auto-tracking' into maintJunio C Hamano2013-10-234-8/+45
|\ \
| * | t3200: fix failure on case-insensitive filesystemsjh/checkout-auto-trackingEric Sunshine2013-09-171-0/+1
| * | branch.c: Relax unnecessary requirement on upstream's remote ref namePer Cederqvist2013-09-092-3/+2
| * | t3200: Add test demonstrating minor regression in 41c21f2Johan Herland2013-09-091-0/+34
| * | Refer to branch.<name>.remote/merge when documenting --trackJohan Herland2013-09-091-2/+4
| * | t3200: Minor fix when preparing for tracking failureJohan Herland2013-09-091-1/+2
| * | t2024: Fix &&-chaining and a couple of typosJohan Herland2013-09-091-3/+3
* | | Merge branch 'nd/fetch-into-shallow' into maintJunio C Hamano2013-10-2312-160/+152
|\ \ \
| * | | Add testcase for needless objects during a shallow fetchnd/fetch-into-shallowMatthijs Kooijman2013-08-281-0/+11
| * | | list-objects: mark more commits as edges in mark_edges_uninterestingNguyễn Thái Ngọc Duy2013-08-281-0/+17
| * | | list-objects: reduce one argument in mark_edges_uninterestingNguyễn Thái Ngọc Duy2013-08-286-9/+8
| * | | upload-pack: delegate rev walking in shallow fetch to pack-objectsNguyễn Thái Ngọc Duy2013-08-282-99/+32
| * | | shallow: add setup_temporary_shallow()Nguyễn Thái Ngọc Duy2013-08-282-0/+24
| * | | shallow: only add shallow graft points to new shallow fileNguyễn Thái Ngọc Duy2013-08-281-0/+2
| * | | move setup_alternate_shallow and write_shallow_commits to shallow.cNguyễn Thái Ngọc Duy2013-08-183-52/+58
* | | | git-merge: document the -S optionNicolas Vigier2013-10-181-1/+5
* | | | Start preparing for 1.8.4.2Junio C Hamano2013-10-172-1/+51
* | | | Merge branch 'jk/upload-pack-keepalive' into maintJunio C Hamano2013-10-172-1/+35
|\ \ \ \
| * | | | upload-pack: bump keepalive default to 5 secondsjk/upload-pack-keepaliveJeff King2013-09-092-2/+2
| * | | | upload-pack: send keepalive packets during pack computationJeff King2013-09-092-1/+35
| | |_|/ | |/| |
* | | | Merge branch 'bc/http-backend-allow-405' into maintJunio C Hamano2013-10-171-2/+4
|\ \ \ \
| * | | | http-backend: provide Allow header for 405bc/http-backend-allow-405Brian M. Carlson2013-09-121-2/+4
* | | | | Merge branch 'jc/cvsserver-perm-bit-fix' into maintJunio C Hamano2013-10-171-1/+1
|\ \ \ \ \
| * | | | | cvsserver: pick up the right mode bitsjc/cvsserver-perm-bit-fixJunio C Hamano2013-09-111-1/+1
* | | | | | Merge branch 'js/add-i-mingw' into maintJunio C Hamano2013-10-171-1/+1
|\ \ \ \ \ \
| * | | | | | add--interactive: fix external command invocation on Windowsjs/add-i-mingwJohannes Sixt2013-09-041-1/+1
* | | | | | | Merge branch 'nd/git-dir-pointing-at-gitfile' into maintJunio C Hamano2013-10-172-5/+8
|\ \ \ \ \ \ \
| * | | | | | | Make setup_git_env() resolve .git file when $GIT_DIR is not specifiednd/git-dir-pointing-at-gitfileNguyễn Thái Ngọc Duy2013-09-032-5/+8
* | | | | | | | Merge branch 'jk/has-sha1-file-retry-packed' into maintJunio C Hamano2013-10-171-1/+4
|\ \ \ \ \ \ \ \
| * | | | | | | | has_sha1_file: re-check pack directory before giving upjk/has-sha1-file-retry-packedJeff King2013-08-301-1/+4
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge branch 'ap/commit-author-mailmap' into maintJunio C Hamano2013-10-172-1/+18
|\ \ \ \ \ \ \ \
| * | | | | | | | commit: search author pattern against mailmapap/commit-author-mailmapAntoine Pelisse2013-08-242-1/+18
* | | | | | | | | Merge branch 'es/rebase-i-no-abbrev' into maintJunio C Hamano2013-10-172-2/+117
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | rebase -i: fix short SHA-1 collisiones/rebase-i-no-abbrevJunio C Hamano2013-08-252-1/+31
| * | | | | | | | | t3404: rebase -i: demonstrate short SHA-1 collisionEric Sunshine2013-08-251-0/+24
| * | | | | | | | | t3404: make tests more self-containedEric Sunshine2013-08-251-2/+63
* | | | | | | | | | Merge branch 'rt/rebase-p-no-merge-summary' into maintJunio C Hamano2013-10-172-1/+25
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | rebase --preserve-merges: ignore "merge.log" configrt/rebase-p-no-merge-summaryRalf Thielow2013-08-212-1/+25
* | | | | | | | | | | Merge branch 'es/rebase-i-respect-core-commentchar' into maintJunio C Hamano2013-10-171-1/+1
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | rebase -i: fix cases ignoring core.commentchares/rebase-i-respect-core-commentcharEric Sunshine2013-08-181-1/+1
| | |_|_|_|/ / / / / / | |/| | | | | | | | |
* | | | | | | | | | | t4254: modernize testsSZEDER Gábor2013-10-171-21/+15
* | | | | | | | | | | git-prune-packed.txt: fix reference to GIT_OBJECT_DIRECTORYSteffen Prohaska2013-10-151-1/+1
* | | | | | | | | | | clone --branch: refuse to clone if upstream repo is emptyRalf Thielow2013-10-142-1/+11
View Lorry Controller Status