Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'rs/cocci' | Junio C Hamano | 2016-10-17 | 6 | -22/+21 |
|\ | |||||
| * | use strbuf_add_unique_abbrev() for adding short hashes, part 3 | René Scharfe | 2016-10-10 | 4 | -20/+15 |
| * | remove unnecessary NULL check before free(3) | René Scharfe | 2016-10-10 | 2 | -2/+6 |
* | | Merge branch 'js/regexec-buf' | Junio C Hamano | 2016-10-17 | 1 | -6/+7 |
|\ \ | |||||
| * | | configure.ac: improve description of NO_REGEX test | Jakub Narębski | 2016-10-10 | 1 | -6/+7 |
* | | | Merge branch 'jk/ref-symlink-loop' | Junio C Hamano | 2016-10-17 | 2 | -1/+18 |
|\ \ \ | |||||
| * | | | files_read_raw_ref: prevent infinite retry loops in generaljk/ref-symlink-loop | Jeff King | 2016-10-10 | 1 | -0/+7 |
| * | | | files_read_raw_ref: avoid infinite loop on broken symlinks | Jeff King | 2016-10-10 | 2 | -1/+11 |
* | | | | Merge branch 'jk/quarantine-received-objects' | Junio C Hamano | 2016-10-17 | 8 | -1/+413 |
|\ \ \ \ | |||||
| * | | | | tmp-objdir: do not migrate files starting with '.' | Jeff King | 2016-10-10 | 1 | -1/+1 |
| * | | | | tmp-objdir: put quarantine information in the environment | Jeff King | 2016-10-10 | 2 | -0/+3 |
| * | | | | receive-pack: quarantine objects until pre-receive accepts | Jeff King | 2016-10-10 | 2 | -1/+76 |
| * | | | | tmp-objdir: introduce API for temporary object directories | Jeff King | 2016-10-10 | 3 | -0/+328 |
| * | | | | check_connected: accept an env argument | Jeff King | 2016-10-10 | 2 | -0/+6 |
* | | | | | Merge branch 'jk/alt-odb-cleanup' | Junio C Hamano | 2016-10-17 | 12 | -222/+308 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | alternates: use fspathcmp to detect duplicates | Jeff King | 2016-10-10 | 3 | -1/+20 |
| * | | | | sha1_file: always allow relative paths to alternates | Jeff King | 2016-10-10 | 2 | -8/+23 |
| * | | | | count-objects: report alternates via verbose mode | Jeff King | 2016-10-10 | 3 | -0/+25 |
| * | | | | fill_sha1_file: write into a strbuf | Jeff King | 2016-10-10 | 1 | -24/+10 |
| * | | | | alternates: store scratch buffer as strbuf | Jeff King | 2016-10-10 | 3 | -18/+32 |
| * | | | | fill_sha1_file: write "boring" characters | Jeff King | 2016-10-10 | 1 | -7/+5 |
| * | | | | alternates: use a separate scratch space | Jeff King | 2016-10-10 | 6 | -37/+24 |
| * | | | | alternates: encapsulate alt->base munging | Jeff King | 2016-10-10 | 1 | -6/+13 |
| * | | | | alternates: provide helper for allocating alternate | Jeff King | 2016-10-10 | 3 | -15/+26 |
| * | | | | alternates: provide helper for adding to alternates list | Jeff King | 2016-10-10 | 3 | -23/+25 |
| * | | | | link_alt_odb_entry: refactor string handling | Jeff King | 2016-10-10 | 1 | -38/+45 |
| * | | | | link_alt_odb_entry: handle normalize_path errors | Jeff King | 2016-10-10 | 3 | -2/+37 |
| * | | | | t5613: clarify "too deep" recursion tests | Jeff King | 2016-10-10 | 1 | -8/+19 |
| * | | | | t5613: do not chdir in main process | Jeff King | 2016-10-03 | 1 | -59/+33 |
| * | | | | t5613: whitespace/style cleanups | Jeff King | 2016-10-03 | 1 | -52/+62 |
| * | | | | t5613: use test_must_fail | Jeff King | 2016-10-03 | 1 | -6/+6 |
| * | | | | t5613: drop test_valid_repo function | Jeff King | 2016-10-03 | 1 | -12/+7 |
| * | | | | t5613: drop reachable_via function | Jeff King | 2016-10-03 | 1 | -10/+0 |
* | | | | | Merge branch 'nd/commit-p-doc' | Junio C Hamano | 2016-10-17 | 1 | -2/+4 |
|\ \ \ \ \ | |||||
| * | | | | | git-commit.txt: clarify --patch mode with pathspecnd/commit-p-doc | Duy Nguyen | 2016-10-05 | 1 | -2/+4 |
* | | | | | | Merge branch 'jk/clone-copy-alternates-fix' | Junio C Hamano | 2016-10-17 | 1 | -2/+5 |
|\ \ \ \ \ \ | |||||
| * | | | | | | clone: detect errors in normalize_path_copyjk/clone-copy-alternates-fix | Jeff King | 2016-10-05 | 1 | -2/+5 |
| |/ / / / / | |||||
* | | | | | | Merge branch 'dt/http-empty-auth' | Junio C Hamano | 2016-10-17 | 1 | -1/+1 |
|\ \ \ \ \ \ | |||||
| * | | | | | | http: http.emptyauth should allow empty (not just NULL) usernamesdt/http-empty-auth | David Turner | 2016-10-04 | 1 | -1/+1 |
* | | | | | | | Sync with maint | Junio C Hamano | 2016-10-11 | 1 | -0/+45 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Start preparing for 2.10.2 | Junio C Hamano | 2016-10-11 | 2 | -1/+46 |
| * | | | | | | | Merge branch 'jk/verify-packfile-gently' into maint | Junio C Hamano | 2016-10-11 | 1 | -5/+2 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge branch 'jc/worktree-config' into maint | Junio C Hamano | 2016-10-11 | 1 | -0/+2 |
| |\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Merge branch 'jc/verify-loose-object-header' into maint | Junio C Hamano | 2016-10-11 | 2 | -8/+30 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ | Merge branch 'rs/git-gui-use-modern-git-merge-syntax' into maint | Junio C Hamano | 2016-10-11 | 1 | -6/+1 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ | Merge branch 'kd/mailinfo-quoted-string' into maint | Junio C Hamano | 2016-10-11 | 6 | -33/+159 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'pb/rev-list-reverse-with-count' into maint | Junio C Hamano | 2016-10-11 | 1 | -2/+3 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jc/blame-abbrev' into maint | Junio C Hamano | 2016-10-11 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/graph-padding-fix' into maint | Junio C Hamano | 2016-10-11 | 1 | -4/+12 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'sg/ref-filter-parse-optim' into maint | Junio C Hamano | 2016-10-11 | 1 | -11/+11 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |