summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Update release notes to 2.7Junio C Hamano2015-12-111-65/+1
* Merge branch 'maint'Junio C Hamano2015-12-111-0/+25
|\
| * Prepare for 2.6.5Junio C Hamano2015-12-112-1/+26
| * Merge branch 'sn/null-pointer-arith-in-mark-tree-uninteresting' into maintJunio C Hamano2015-12-111-1/+3
| |\
| * \ Merge branch 'sg/lock-file-commit-error' into maintJunio C Hamano2015-12-114-5/+8
| |\ \
| * \ \ Merge branch 'cb/t3404-shellquote' into maintJunio C Hamano2015-12-111-1/+1
| |\ \ \
| * \ \ \ Merge branch 'sb/doc-submodule-sync-recursive' into maintJunio C Hamano2015-12-111-1/+4
| |\ \ \ \
| * \ \ \ \ Merge branch 'nd/doc-check-ref-format-typo' into maintJunio C Hamano2015-12-111-1/+1
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'rs/show-branch-argv-array' into maintJunio C Hamano2015-12-111-16/+8
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'rs/pop-commit' into maintJunio C Hamano2015-12-1110-92/+31
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'as/subtree-with-spaces' into maintJunio C Hamano2015-12-112-74/+124
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'jk/test-lint-forbid-when-finished-in-subshell' into maintJunio C Hamano2015-12-114-16/+31
| |\ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ Merge branch 'sn/null-pointer-arith-in-mark-tree-uninteresting'Junio C Hamano2015-12-111-1/+3
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | |
| * | | | | | | | | | revision.c: fix possible null pointer arithmeticsn/null-pointer-arith-in-mark-tree-uninterestingStefan Naewe2015-12-071-1/+3
* | | | | | | | | | | Merge branch 'sb/doc-submodule-sync-recursive'Junio C Hamano2015-12-111-1/+4
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / | |/| | | | | | | | |
| * | | | | | | | | | document submodule sync --recursivesb/doc-submodule-sync-recursiveStefan Beller2015-12-041-1/+4
| |/ / / / / / / / /
* | | | | | | | | | Merge branch 'cb/t3404-shellquote'Junio C Hamano2015-12-111-1/+1
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / | |/| | | | | | | |
| * | | | | | | | | t3404: fix quoting of redirect for some versions of bashcb/t3404-shellquoteCharles Bailey2015-12-041-1/+1
* | | | | | | | | | Merge branch 'sg/lock-file-commit-error'Junio C Hamano2015-12-114-5/+8
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
| * | | | | | | | | Make error message after failing commit_lock_file() less confusingSZEDER Gábor2015-12-014-5/+8
* | | | | | | | | | Git 2.7-rc0v2.7.0-rc0Junio C Hamano2015-12-101-1/+1
* | | | | | | | | | Sync with maintJunio C Hamano2015-12-101-0/+1
|\ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / | |/| | | | | | | |
| * | | | | | | | | Documentation/git-update-index: add missing opts to synopsisChristian Couder2015-12-101-0/+1
* | | | | | | | | | Update release notes to 2.7Junio C Hamano2015-12-101-0/+19
* | | | | | | | | | Merge branch 'nd/doc-check-ref-format-typo'Junio C Hamano2015-12-101-1/+1
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
| * | | | | | | | | git-check-ref-format.txt: typo, s/avoids/avoid/nd/doc-check-ref-format-typoNguyễn Thái Ngọc Duy2015-12-041-1/+1
| | |_|_|/ / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'bc/object-id'Junio C Hamano2015-12-1088-704/+716
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | remote: convert functions to struct object_idbrian m. carlson2015-11-201-29/+29
| * | | | | | | | | 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
View Lorry Controller Status