summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | | | | | | Remove get_object_hash.brian m. carlson2015-11-2063-253/+251
| * | | | | | | | | | | | | | Convert struct object to object_idbrian m. carlson2015-11-2054-256/+256
| * | | | | | | | | | | | | | Add several uses of get_object_hash.brian m. carlson2015-11-2061-253/+253
| * | | | | | | | | | | | | | object: introduce get_object_hash macro.brian m. carlson2015-11-201-0/+2
| * | | | | | | | | | | | | | ref_newer: convert to use struct object_idbrian m. carlson2015-11-204-8/+8
| * | | | | | | | | | | | | | push_refs_with_export: convert to struct object_idbrian m. carlson2015-11-201-4/+4
| * | | | | | | | | | | | | | get_remote_heads: convert to struct object_idbrian m. carlson2015-11-201-10/+12
| * | | | | | | | | | | | | | parse_fetch: convert to use struct object_idbrian m. carlson2015-11-201-6/+6
| * | | | | | | | | | | | | | add_sought_entry_mem: convert to struct object_idbrian m. carlson2015-11-201-6/+8
| * | | | | | | | | | | | | | Convert struct ref to use object_id.brian m. carlson2015-11-2018-151/+151
| * | | | | | | | | | | | | | sha1_file: introduce has_object_file helper.brian m. carlson2015-11-202-0/+8
* | | | | | | | | | | | | | | Merge branch 'dt/fsck-verify-pack-error'Junio C Hamano2015-12-101-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | verify_pack: do not ignore return value of verification functiondt/fsck-verify-pack-errorDavid Turner2015-12-011-1/+1
| | |_|_|/ / / / / / / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'ls/travis-yaml'Junio C Hamano2015-12-101-0/+91
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Add Travis CI supportls/travis-yamlLars Schneider2015-11-281-0/+91
* | | | | | | | | | | | | | | Merge branch 'ep/ident-with-getaddrinfo'Junio C Hamano2015-12-081-4/+27
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | ident.c: add support for IPv6Elia Pinto2015-11-281-4/+27
* | | | | | | | | | | | | | | Merge branch 'ls/test-must-fail-sigpipe'Junio C Hamano2015-12-083-20/+41
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | add "ok=sigpipe" to test_must_fail and use it to fix flaky testsls/test-must-fail-sigpipeLars Schneider2015-11-283-6/+8
| * | | | | | | | | | | | | | | implement test_might_fail using a refactored test_must_failLars Schneider2015-11-281-14/+33
| | |_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch 'dt/refs-backend-pre-vtable'Junio C Hamano2015-12-087-3682/+3776
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | refs: break out ref conflict checksdt/refs-backend-pre-vtableDavid Turner2015-11-203-42/+67
| * | | | | | | | | | | | | | | files_log_ref_write: new functionDavid Turner2015-11-202-0/+12
| * | | | | | | | | | | | | | | initdb: make safe_create_dir publicDavid Turner2015-11-203-12/+20
| * | | | | | | | | | | | | | | refs: split filesystem-based refs code into a new fileMichael Haggerty2015-11-203-3536/+3545
| * | | | | | | | | | | | | | | refs/refs-internal.h: new header fileMichael Haggerty2015-11-202-165/+189
| * | | | | | | | | | | | | | | refname_is_safe(): improve docstringMichael Haggerty2015-11-201-6/+10
| * | | | | | | | | | | | | | | pack_if_possible_fn(): use ref_type() instead of is_per_worktree_ref()Michael Haggerty2015-11-201-3/+1
| * | | | | | | | | | | | | | | copy_msg(): rename to copy_reflog_msg()David Turner2015-11-201-2/+2
| * | | | | | | | | | | | | | | verify_refname_available(): new functionRonnie Sahlberg2015-11-201-26/+40
| * | | | | | | | | | | | | | | verify_refname_available(): rename functionRonnie Sahlberg2015-11-201-22/+22
* | | | | | | | | | | | | | | | Sync with 2.6.4Junio C Hamano2015-12-083-6/+21
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Git 2.6.4v2.6.4Junio C Hamano2015-12-083-2/+18
| * | | | | | | | | | | | | | | Merge branch 'rs/status-detached-head-memcmp' into maintJunio C Hamano2015-12-081-5/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | wt-status: correct and simplify check for detached HEADrs/status-detached-head-memcmpRené Scharfe2015-11-281-5/+4
| * | | | | | | | | | | | | | | | Merge branch 'ad/sha1-update-chunked' into maintJunio C Hamano2015-12-087-13/+69
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'sg/bash-prompt-dirty-orphan' into maintJunio C Hamano2015-12-082-7/+31
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/interpret-trailers-outside-a-repository' into maintJunio C Hamano2015-12-081-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/rebase-no-autostash' into maintJunio C Hamano2015-12-083-2/+16
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Sync with maintJunio C Hamano2015-12-041-0/+48
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | Prepare for 2.6.4Junio C Hamano2015-12-042-1/+49
| * | | | | | | | | | | | | | | | | | | | Merge branch 'da/difftool' into maintJunio C Hamano2015-12-042-3/+20
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'dk/gc-idx-wo-pack' into maintJunio C Hamano2015-12-046-22/+78
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | RelNotes update for 2.7Junio C Hamano2015-12-041-0/+51
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'sg/bash-prompt-dirty-orphan'Junio C Hamano2015-12-042-7/+31
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | bash prompt: indicate dirty index even on orphan branchessg/bash-prompt-dirty-orphanSZEDER Gábor2015-11-242-5/+4
| * | | | | | | | | | | | | | | | | | | | | bash prompt: remove a redundant 'git diff' optionSZEDER Gábor2015-11-241-1/+1
| * | | | | | | | | | | | | | | | | | | | | bash prompt: test dirty index and worktree while on an orphan branchSZEDER Gábor2015-11-241-3/+28
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'np/credential-cache-sighup'Junio C Hamano2015-12-042-0/+10
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | credential-cache: new option to ignore sighupnp/credential-cache-sighupNoam Postavsky2015-11-202-0/+10
| | |_|_|_|_|_|_|_|_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | |