summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Documentation: add setup instructions for Travis CIls/travis-submitting-patchesLars Schneider2016-05-021-17/+63
* 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
| | |_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'rs/parseopt-short-help'Junio C Hamano2015-12-044-48/+23
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | show-ref: stop using PARSE_OPT_NO_INTERNAL_HELPrs/parseopt-short-helpRené Scharfe2015-11-201-11/+1
| * | | | | | | | | | | | grep: stop using PARSE_OPT_NO_INTERNAL_HELPRené Scharfe2015-11-201-16/+1
| * | | | | | | | | | | | parse-options: allow -h as a short optionRené Scharfe2015-11-202-6/+11
| * | | | | | | | | | | | parse-options: inline parse_options_usage() at its only remaining callerRené Scharfe2015-11-201-12/+1
| * | | | | | | | | | | | parse-options: deduplicate parse_options_usage() callsRené Scharfe2015-11-201-6/+12
| |/ / / / / / / / / / /
* | | | | | | | | | | | Merge branch 'jk/send-email-complete-aliases'Junio C Hamano2015-12-044-0/+124
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | completion: add support for completing email aliasesJacob Keller2015-11-201-0/+16
| * | | | | | | | | | | | sendemail: teach git-send-email to dump alias namesJacob Keller2015-11-203-0/+108
| |/ / / / / / / / / / /
* | | | | | | | | | | | Merge branch 'jk/filter-branch-no-index'Junio C Hamano2015-12-042-2/+40
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | filter-branch: skip index read/write when possibleJeff King2015-11-062-2/+40
| | |_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'ad/sha1-update-chunked'Junio C Hamano2015-12-047-13/+69
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | |
| * | | | | | | | | | | sha1: allow limiting the size of the data passed to SHA1_Update()ad/sha1-update-chunkedAtousa Pahlevan Duprat2015-11-055-0/+44
| * | | | | | | | | | | sha1: provide another level of indirection for the SHA-1 functionsAtousa Pahlevan Duprat2015-11-053-13/+25