summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'rs/cocci'Junio C Hamano2016-10-176-22/+21
|\
| * use strbuf_add_unique_abbrev() for adding short hashes, part 3René Scharfe2016-10-104-20/+15
| * remove unnecessary NULL check before free(3)René Scharfe2016-10-102-2/+6
* | Merge branch 'js/regexec-buf'Junio C Hamano2016-10-171-6/+7
|\ \
| * | configure.ac: improve description of NO_REGEX testJakub Narębski2016-10-101-6/+7
* | | Merge branch 'jk/ref-symlink-loop'Junio C Hamano2016-10-172-1/+18
|\ \ \
| * | | files_read_raw_ref: prevent infinite retry loops in generaljk/ref-symlink-loopJeff King2016-10-101-0/+7
| * | | files_read_raw_ref: avoid infinite loop on broken symlinksJeff King2016-10-102-1/+11
* | | | Merge branch 'jk/quarantine-received-objects'Junio C Hamano2016-10-178-1/+413
|\ \ \ \
| * | | | tmp-objdir: do not migrate files starting with '.'Jeff King2016-10-101-1/+1
| * | | | tmp-objdir: put quarantine information in the environmentJeff King2016-10-102-0/+3
| * | | | receive-pack: quarantine objects until pre-receive acceptsJeff King2016-10-102-1/+76
| * | | | tmp-objdir: introduce API for temporary object directoriesJeff King2016-10-103-0/+328
| * | | | check_connected: accept an env argumentJeff King2016-10-102-0/+6
* | | | | Merge branch 'jk/alt-odb-cleanup'Junio C Hamano2016-10-1712-222/+308
|\ \ \ \ \ | |/ / / /
| * | | | alternates: use fspathcmp to detect duplicatesJeff King2016-10-103-1/+20
| * | | | sha1_file: always allow relative paths to alternatesJeff King2016-10-102-8/+23
| * | | | count-objects: report alternates via verbose modeJeff King2016-10-103-0/+25
| * | | | fill_sha1_file: write into a strbufJeff King2016-10-101-24/+10
| * | | | alternates: store scratch buffer as strbufJeff King2016-10-103-18/+32
| * | | | fill_sha1_file: write "boring" charactersJeff King2016-10-101-7/+5
| * | | | alternates: use a separate scratch spaceJeff King2016-10-106-37/+24
| * | | | alternates: encapsulate alt->base mungingJeff King2016-10-101-6/+13
| * | | | alternates: provide helper for allocating alternateJeff King2016-10-103-15/+26
| * | | | alternates: provide helper for adding to alternates listJeff King2016-10-103-23/+25
| * | | | link_alt_odb_entry: refactor string handlingJeff King2016-10-101-38/+45
| * | | | link_alt_odb_entry: handle normalize_path errorsJeff King2016-10-103-2/+37
| * | | | t5613: clarify "too deep" recursion testsJeff King2016-10-101-8/+19
| * | | | t5613: do not chdir in main processJeff King2016-10-031-59/+33
| * | | | t5613: whitespace/style cleanupsJeff King2016-10-031-52/+62
| * | | | t5613: use test_must_failJeff King2016-10-031-6/+6
| * | | | t5613: drop test_valid_repo functionJeff King2016-10-031-12/+7
| * | | | t5613: drop reachable_via functionJeff King2016-10-031-10/+0
* | | | | Merge branch 'nd/commit-p-doc'Junio C Hamano2016-10-171-2/+4
|\ \ \ \ \
| * | | | | git-commit.txt: clarify --patch mode with pathspecnd/commit-p-docDuy Nguyen2016-10-051-2/+4
* | | | | | Merge branch 'jk/clone-copy-alternates-fix'Junio C Hamano2016-10-171-2/+5
|\ \ \ \ \ \
| * | | | | | clone: detect errors in normalize_path_copyjk/clone-copy-alternates-fixJeff King2016-10-051-2/+5
| |/ / / / /
* | | | | | Merge branch 'dt/http-empty-auth'Junio C Hamano2016-10-171-1/+1
|\ \ \ \ \ \
| * | | | | | http: http.emptyauth should allow empty (not just NULL) usernamesdt/http-empty-authDavid Turner2016-10-041-1/+1
* | | | | | | Sync with maintJunio C Hamano2016-10-111-0/+45
|\ \ \ \ \ \ \
| * | | | | | | Start preparing for 2.10.2Junio C Hamano2016-10-112-1/+46
| * | | | | | | Merge branch 'jk/verify-packfile-gently' into maintJunio C Hamano2016-10-111-5/+2
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'jc/worktree-config' into maintJunio C Hamano2016-10-111-0/+2
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'jc/verify-loose-object-header' into maintJunio C Hamano2016-10-112-8/+30
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'rs/git-gui-use-modern-git-merge-syntax' into maintJunio C Hamano2016-10-111-6/+1
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'kd/mailinfo-quoted-string' into maintJunio C Hamano2016-10-116-33/+159
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'pb/rev-list-reverse-with-count' into maintJunio C Hamano2016-10-111-2/+3
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/blame-abbrev' into maintJunio C Hamano2016-10-111-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/graph-padding-fix' into maintJunio C Hamano2016-10-111-4/+12
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'sg/ref-filter-parse-optim' into maintJunio C Hamano2016-10-111-11/+11
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \