summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* cygwin: stop forcing core.filemode=falseml/cygwin-updatesMark Levedahl2013-07-211-1/+0
* Cygwin 1.7 supports mmapMark Levedahl2013-07-211-4/+4
* Cygwin 1.7 has thread-safe preadMark Levedahl2013-07-211-1/+1
* Cygwin 1.7 needs compat/regexMark Levedahl2013-07-211-0/+2
* Sync with maintJunio C Hamano2013-07-194-3/+18
|\
| * Start preparing for 1.8.3.4Junio C Hamano2013-07-192-1/+16
| * apply.c::find_name_traditional(): do not initialize len to the line's lengthStefan Beller2013-07-191-1/+1
| * http-push.c::add_send_request(): do not initialize transfer_requestStefan Beller2013-07-191-1/+1
| * Merge branch 'tr/test-lint-no-export-assignment-in-shell' into maintJunio C Hamano2013-07-192-1/+2
| |\
| * \ Merge branch 'rr/name-rev-stdin-doc' into maintJunio C Hamano2013-07-191-2/+4
| |\ \
| * \ \ Merge branch 'ft/diff-rename-default-score-is-half' into maintJunio C Hamano2013-07-191-1/+1
| |\ \ \
| * \ \ \ Merge branch 'jc/t1512-fix' into maintJunio C Hamano2013-07-192-11/+23
| |\ \ \ \
| * \ \ \ \ Merge branch 'vl/typofix' into maintJunio C Hamano2013-07-193-3/+3
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'wk/doc-git-has-grown' into maintJunio C Hamano2013-07-191-3/+3
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'ys/cygstart' into maintJunio C Hamano2013-07-192-3/+9
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'mm/push-force-is-dangerous' into maintJunio C Hamano2013-07-191-0/+9
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'rs/logical-vs-binary-or' into maintJunio C Hamano2013-07-193-6/+6
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'js/test-ln-s-add' into maintJunio C Hamano2013-07-1930-333/+351
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/apache-test-for-2.4' into maintJunio C Hamano2013-07-191-1/+19
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'tr/test-commit-only-on-orphan' into maintJunio C Hamano2013-07-191-0/+13
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'sb/archive-zip-double-assignment-fix' into maintJunio C Hamano2013-07-191-1/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'th/bisect-skip-report-range-fix' into maintJunio C Hamano2013-07-191-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'rs/tar-tests' into maintJunio C Hamano2013-07-193-78/+92
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'rr/column-doc' into maintJunio C Hamano2013-07-191-3/+17
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'rs/discard-index-discard-array' into maintJunio C Hamano2013-07-195-2/+32
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'tr/coverage' into maintJunio C Hamano2013-07-191-8/+13
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | Documentation: "git reset <tree-ish> <pathspec>" takes a tree-ish, not tree-shStefan Beller2013-07-191-1/+1
* | | | | | | | | | | | | | | | | | | | Update draft release notes to 1.8.4Junio C Hamano2013-07-181-0/+16
* | | | | | | | | | | | | | | | | | | | Merge branch 'jc/revert-clone-doc-update-for-push-from-shallow'Junio C Hamano2013-07-181-7/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | Revert "git-clone.txt: remove the restriction on pushing from a shallow clone"jc/revert-clone-doc-update-for-push-from-shallowJunio C Hamano2013-07-151-7/+5
* | | | | | | | | | | | | | | | | | | | | Merge branch 'rs/mailmap-himself'Junio C Hamano2013-07-181-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | .mailmap: René Scharfe has a new email addressrs/mailmap-himselfRené Scharfe2013-07-171-1/+1
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'sb/mailmap-updates'Junio C Hamano2013-07-181-34/+151
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | .mailmap: combine more (email, name) to individual personsStefan Beller2013-07-171-3/+7
| * | | | | | | | | | | | | | | | | | | | | | .mailmap: Combine more (email, name) to individual personsStefan Beller2013-07-151-7/+35
| * | | | | | | | | | | | | | | | | | | | | | .mailmap: Map email addresses to namesStefan Beller2013-07-121-25/+110
* | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/in-pack-size-measurement'Junio C Hamano2013-07-187-106/+390
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | pack-revindex: radix-sort the revindexjk/in-pack-size-measurementJeff King2013-07-121-5/+95
| * | | | | | | | | | | | | | | | | | | | | | | pack-revindex: use unsigned to store number of objectsJeff King2013-07-121-4/+4
| * | | | | | | | | | | | | | | | | | | | | | | cat-file: split --batch input lines on whitespaceJeff King2013-07-123-3/+34
| * | | | | | | | | | | | | | | | | | | | | | | cat-file: add %(objectsize:disk) format atomJeff King2013-07-122-0/+24
| * | | | | | | | | | | | | | | | | | | | | | | cat-file: add --batch-check=<format>Jeff King2013-07-123-26/+142
| * | | | | | | | | | | | | | | | | | | | | | | cat-file: refactor --batch option parsingJeff King2013-07-111-18/+38
| * | | | | | | | | | | | | | | | | | | | | | | cat-file: teach --batch to stream blob objectsJeff King2013-07-111-13/+28
| * | | | | | | | | | | | | | | | | | | | | | | t1006: modernize output comparisonsJeff King2013-07-111-43/+18
| * | | | | | | | | | | | | | | | | | | | | | | teach sha1_object_info_extended a "disk_size" queryJeff King2013-07-072-4/+17
| * | | | | | | | | | | | | | | | | | | | | | | zero-initialize object_info structsJeff King2013-07-072-2/+2
* | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'bp/mediawiki-preview'Junio C Hamano2013-07-188-83/+528
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | git-remote-mediawiki: add preview subcommand into git mwbp/mediawiki-previewBenoit Person2013-07-082-2/+311
| * | | | | | | | | | | | | | | | | | | | | | | | git-remote-mediawiki: add git-mw commandBenoit Person2013-07-082-3/+64