summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | | | Merge branch 'jc/revision-range-unpeel' into maintJunio C Hamano2013-11-072-22/+45
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | revision: do not peel tags used in range notationJunio C Hamano2013-10-152-22/+45
* | | | | | | | | | | | gitignore.txt: fix documentation of "**" patternsKarsten Blees2013-11-071-3/+3
* | | | | | | | | | | | t5570: Update for clone-progress-to-stderr branchBrian Gernhardt2013-10-301-2/+1
| |_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | |
* | | | | | | | | | | Git 1.8.4.2v1.8.4.2Junio C Hamano2013-10-283-2/+17
* | | | | | | | | | | Merge branch 'jk/clone-progress-to-stderr' into maintJunio C Hamano2013-10-284-28/+32
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / | |/| | | | | | | | |
| * | | | | | | | | | clone: always set transport optionsjk/clone-progress-to-stderrJeff King2013-09-182-16/+18
| * | | | | | | | | | clone: treat "checking connectivity" like other progressJeff King2013-09-182-3/+4
| * | | | | | | | | | clone: send diagnostic messages to stderrJeff King2013-09-183-10/+11
| | |_|_|_|_|_|_|/ / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'jk/format-patch-from' into maintJunio C Hamano2013-10-284-1/+49
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | format-patch: print in-body "From" only when neededjk/format-patch-fromJeff King2013-09-204-1/+49
* | | | | | | | | | | Merge branch 'jk/shortlog-tolerate-broken-commit' into maintJunio C Hamano2013-10-282-2/+20
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | shortlog: ignore commits with missing authorsjk/shortlog-tolerate-broken-commitJeff King2013-09-182-2/+20
* | | | | | | | | | | | Merge branch 'jk/diff-algo' into maintJunio C Hamano2013-10-281-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | merge-recursive: fix parsing of "diff-algorithm" optionjk/diff-algoJohn Keeping2013-09-261-2/+2
* | | | | | | | | | | | | test-lib: fix typo in commentTorstein Hegge2013-10-281-1/+1
* | | | | | | | | | | | | sha1_file: move comment about return value where it belongsChristian Couder2013-10-281-1/+1
* | | | | | | | | | | | | 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
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \