summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'rs/diff-no-minimal' into maintJunio C Hamano2010-06-217-11/+11
|\
| * git diff too slow for a fileRené Scharfe2010-05-027-11/+11
* | Merge branch 'bg/apply-blank-trailing-context' into maintJunio C Hamano2010-06-212-6/+18
|\ \
| * | apply: Allow blank *trailing* context lines to match beyond EOFBjörn Gustavsson2010-04-072-6/+18
* | | gitweb/Makefile: fix typo in gitweb.min.css ruleJay Soffian2010-06-201-1/+1
* | | Prepare draft release notes to 1.7.1.1Junio C Hamano2010-06-162-1/+47
* | | Merge branch 'cw/maint-exec-defpath' into maintJunio C Hamano2010-06-165-1/+28
|\ \ \
| * | | autoconf: Check if <paths.h> exists and set HAVE_PATHS_HJakub Narebski2010-04-152-0/+7
| * | | exec_cmd.c: replace hard-coded path list with one from <paths.h>Chris Webb2010-04-153-1/+21
* | | | Merge branch 'sc/http-late-auth' into maintJunio C Hamano2010-06-163-2/+24
|\ \ \ \
| * | | | Prompt for a username when an HTTP request 401sScott Chacon2010-04-013-2/+24
* | | | | Merge branch 'by/blame-doc-m-c' into maintJunio C Hamano2010-06-161-4/+6
|\ \ \ \ \
| * | | | | blame-options.txt: Add default value for `-M/-C` options.Bo Yang2010-05-071-4/+6
* | | | | | Merge branch 'cb/maint-stash-orphaned-file' into maintJunio C Hamano2010-06-162-1/+151
|\ \ \ \ \ \
| * | | | | | stash tests: stash can lose data in a file removed from the indexCharles Bailey2010-04-201-0/+150
| * | | | | | stash: Don't overwrite files that have gone from the indexCharles Bailey2010-04-181-1/+1
* | | | | | | Merge branch 'mg/advice-statushints' into maintJunio C Hamano2010-06-162-6/+60
|\ \ \ \ \ \ \
| * | | | | | | wt-status: take advice.statusHints seriouslyMichael J Gruber2010-05-062-7/+16
| * | | | | | | t7508: test advice.statusHintsMichael J Gruber2010-05-061-0/+45
* | | | | | | | Merge branch 'jn/maint-bundle' into maintJunio C Hamano2010-06-162-2/+18
|\ \ \ \ \ \ \ \
| * | | | | | | | fix "bundle --stdin" segfaultJonathan Nieder2010-04-191-2/+2
| * | | | | | | | t5704 (bundle): add tests for bundle --stdinJonathan Nieder2010-04-191-0/+16
* | | | | | | | | Merge branch 'rr/doc-submitting' into maintJunio C Hamano2010-06-161-11/+38
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | SubmittingPatches: Add new section about what to base work onRamkumar Ramachandra2010-04-181-11/+38
| | |_|/ / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'jn/t7006-fixup' into maintJunio C Hamano2010-06-162-48/+117
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | t7006: guard cleanup with test_expect_successJonathan Nieder2010-04-142-48/+117
* | | | | | | | | | Merge branch 'jn/shortlog' into maintJunio C Hamano2010-06-166-29/+144
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | pretty: Respect --abbrev optionWill Palmer2010-05-045-5/+39
| * | | | | | | | | | shortlog: Document and test --format optionJonathan Nieder2010-05-042-1/+60
| * | | | | | | | | | t4201 (shortlog): Test output format with multiple authorsJonathan Nieder2010-05-041-0/+7
| * | | | | | | | | | t4201 (shortlog): guard setup with test_expect_successJonathan Nieder2010-05-041-29/+39
| * | | | | | | | | | Documentation/shortlog: scripted users should not rely on implicit HEADJonathan Nieder2010-05-041-1/+6
* | | | | | | | | | | Merge branch 'np/index-pack-memsave' into maintJunio C Hamano2010-06-161-44/+45
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | index-pack: smarter memory usage when appending objectsNicolas Pitre2010-04-121-12/+12
| * | | | | | | | | | | index-pack: rationalize unpack_entry_data()Nicolas Pitre2010-04-121-11/+8
| * | | | | | | | | | | index-pack: smarter memory usage when resolving deltasNicolas Pitre2010-04-121-21/+25
* | | | | | | | | | | | Merge branch 'sp/maint-dumb-http-pack-reidx' into maintJunio C Hamano2010-06-168-60/+149
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | http.c::new_http_pack_request: do away with the temp variable filenameTay Ray Chuan2010-04-191-3/+2
| * | | | | | | | | | | | http-fetch: Use temporary files for pack-*.idx until verifiedShawn O. Pearce2010-04-192-17/+54
| * | | | | | | | | | | | http-fetch: Use index-pack rather than verify-pack to check packsShawn O. Pearce2010-04-192-7/+52
| * | | | | | | | | | | | Allow parse_pack_index on temporary filesShawn O. Pearce2010-04-193-4/+3
| * | | | | | | | | | | | Extract verify_pack_index for reuse from verify_packShawn O. Pearce2010-04-192-3/+13
| * | | | | | | | | | | | Introduce close_pack_index to permit replacementShawn O. Pearce2010-04-192-2/+10
| * | | | | | | | | | | | http.c: Remove unnecessary strdup of sha1_to_hex resultShawn O. Pearce2010-04-191-4/+2
| * | | | | | | | | | | | http.c: Don't store destination name in request structuresShawn O. Pearce2010-04-173-11/+7
| * | | | | | | | | | | | http.c: Drop useless != NULL test in finish_http_pack_requestShawn O. Pearce2010-04-171-6/+3
| * | | | | | | | | | | | http.c: Tiny refactoring of finish_http_pack_requestShawn O. Pearce2010-04-171-8/+8
| * | | | | | | | | | | | t5550-http-fetch: Use subshell for repository operationsShawn O. Pearce2010-04-171-3/+4
| * | | | | | | | | | | | http.c: Remove bad free of static blockShawn O. Pearce2010-04-171-1/+0
| | |_|/ / / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'jc/am-3-show-corrupted-patch' into maintJunio C Hamano2010-06-161-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \