Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Documentation: add setup instructions for Travis CIls/travis-submitting-patches | Lars Schneider | 2016-05-02 | 1 | -17/+63 |
* | Merge branch 'ep/ident-with-getaddrinfo' | Junio C Hamano | 2015-12-08 | 1 | -4/+27 |
|\ | |||||
| * | ident.c: add support for IPv6 | Elia Pinto | 2015-11-28 | 1 | -4/+27 |
* | | Merge branch 'ls/test-must-fail-sigpipe' | Junio C Hamano | 2015-12-08 | 3 | -20/+41 |
|\ \ | |||||
| * | | add "ok=sigpipe" to test_must_fail and use it to fix flaky testsls/test-must-fail-sigpipe | Lars Schneider | 2015-11-28 | 3 | -6/+8 |
| * | | implement test_might_fail using a refactored test_must_fail | Lars Schneider | 2015-11-28 | 1 | -14/+33 |
* | | | Merge branch 'dt/refs-backend-pre-vtable' | Junio C Hamano | 2015-12-08 | 7 | -3682/+3776 |
|\ \ \ | |||||
| * | | | refs: break out ref conflict checksdt/refs-backend-pre-vtable | David Turner | 2015-11-20 | 3 | -42/+67 |
| * | | | files_log_ref_write: new function | David Turner | 2015-11-20 | 2 | -0/+12 |
| * | | | initdb: make safe_create_dir public | David Turner | 2015-11-20 | 3 | -12/+20 |
| * | | | refs: split filesystem-based refs code into a new file | Michael Haggerty | 2015-11-20 | 3 | -3536/+3545 |
| * | | | refs/refs-internal.h: new header file | Michael Haggerty | 2015-11-20 | 2 | -165/+189 |
| * | | | refname_is_safe(): improve docstring | Michael Haggerty | 2015-11-20 | 1 | -6/+10 |
| * | | | pack_if_possible_fn(): use ref_type() instead of is_per_worktree_ref() | Michael Haggerty | 2015-11-20 | 1 | -3/+1 |
| * | | | copy_msg(): rename to copy_reflog_msg() | David Turner | 2015-11-20 | 1 | -2/+2 |
| * | | | verify_refname_available(): new function | Ronnie Sahlberg | 2015-11-20 | 1 | -26/+40 |
| * | | | verify_refname_available(): rename function | Ronnie Sahlberg | 2015-11-20 | 1 | -22/+22 |
* | | | | Sync with 2.6.4 | Junio C Hamano | 2015-12-08 | 3 | -6/+21 |
|\ \ \ \ | |||||
| * | | | | Git 2.6.4v2.6.4 | Junio C Hamano | 2015-12-08 | 3 | -2/+18 |
| * | | | | Merge branch 'rs/status-detached-head-memcmp' into maint | Junio C Hamano | 2015-12-08 | 1 | -5/+4 |
| |\ \ \ \ | |||||
| | * | | | | wt-status: correct and simplify check for detached HEADrs/status-detached-head-memcmp | René Scharfe | 2015-11-28 | 1 | -5/+4 |
| * | | | | | Merge branch 'ad/sha1-update-chunked' into maint | Junio C Hamano | 2015-12-08 | 7 | -13/+69 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'sg/bash-prompt-dirty-orphan' into maint | Junio C Hamano | 2015-12-08 | 2 | -7/+31 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge branch 'jk/interpret-trailers-outside-a-repository' into maint | Junio C Hamano | 2015-12-08 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge branch 'jk/rebase-no-autostash' into maint | Junio C Hamano | 2015-12-08 | 3 | -2/+16 |
| |\ \ \ \ \ \ \ \ | |||||
* | \ \ \ \ \ \ \ \ | Sync with maint | Junio C Hamano | 2015-12-04 | 1 | -0/+48 |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | |||||
| * | | | | | | | | | Prepare for 2.6.4 | Junio C Hamano | 2015-12-04 | 2 | -1/+49 |
| * | | | | | | | | | Merge branch 'da/difftool' into maint | Junio C Hamano | 2015-12-04 | 2 | -3/+20 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ | Merge branch 'dk/gc-idx-wo-pack' into maint | Junio C Hamano | 2015-12-04 | 6 | -22/+78 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
* | | | | | | | | | | | | RelNotes update for 2.7 | Junio C Hamano | 2015-12-04 | 1 | -0/+51 |
* | | | | | | | | | | | | Merge branch 'sg/bash-prompt-dirty-orphan' | Junio C Hamano | 2015-12-04 | 2 | -7/+31 |
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / / | |/| | | | | | | | | | | |||||
| * | | | | | | | | | | | bash prompt: indicate dirty index even on orphan branchessg/bash-prompt-dirty-orphan | SZEDER Gábor | 2015-11-24 | 2 | -5/+4 |
| * | | | | | | | | | | | bash prompt: remove a redundant 'git diff' option | SZEDER Gábor | 2015-11-24 | 1 | -1/+1 |
| * | | | | | | | | | | | bash prompt: test dirty index and worktree while on an orphan branch | SZEDER Gábor | 2015-11-24 | 1 | -3/+28 |
* | | | | | | | | | | | | Merge branch 'np/credential-cache-sighup' | Junio C Hamano | 2015-12-04 | 2 | -0/+10 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | credential-cache: new option to ignore sighupnp/credential-cache-sighup | Noam Postavsky | 2015-11-20 | 2 | -0/+10 |
| | |_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | |||||
* | | | | | | | | | | | | Merge branch 'rs/parseopt-short-help' | Junio C Hamano | 2015-12-04 | 4 | -48/+23 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | show-ref: stop using PARSE_OPT_NO_INTERNAL_HELPrs/parseopt-short-help | René Scharfe | 2015-11-20 | 1 | -11/+1 |
| * | | | | | | | | | | | | grep: stop using PARSE_OPT_NO_INTERNAL_HELP | René Scharfe | 2015-11-20 | 1 | -16/+1 |
| * | | | | | | | | | | | | parse-options: allow -h as a short option | René Scharfe | 2015-11-20 | 2 | -6/+11 |
| * | | | | | | | | | | | | parse-options: inline parse_options_usage() at its only remaining caller | René Scharfe | 2015-11-20 | 1 | -12/+1 |
| * | | | | | | | | | | | | parse-options: deduplicate parse_options_usage() calls | René Scharfe | 2015-11-20 | 1 | -6/+12 |
| |/ / / / / / / / / / / | |||||
* | | | | | | | | | | | | Merge branch 'jk/send-email-complete-aliases' | Junio C Hamano | 2015-12-04 | 4 | -0/+124 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | completion: add support for completing email aliases | Jacob Keller | 2015-11-20 | 1 | -0/+16 |
| * | | | | | | | | | | | | sendemail: teach git-send-email to dump alias names | Jacob Keller | 2015-11-20 | 3 | -0/+108 |
| |/ / / / / / / / / / / | |||||
* | | | | | | | | | | | | Merge branch 'jk/filter-branch-no-index' | Junio C Hamano | 2015-12-04 | 2 | -2/+40 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | filter-branch: skip index read/write when possible | Jeff King | 2015-11-06 | 2 | -2/+40 |
| | |_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | |||||
* | | | | | | | | | | | | Merge branch 'ad/sha1-update-chunked' | Junio C Hamano | 2015-12-04 | 7 | -13/+69 |
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | |||||
| * | | | | | | | | | | | sha1: allow limiting the size of the data passed to SHA1_Update()ad/sha1-update-chunked | Atousa Pahlevan Duprat | 2015-11-05 | 5 | -0/+44 |
| * | | | | | | | | | | | sha1: provide another level of indirection for the SHA-1 functions | Atousa Pahlevan Duprat | 2015-11-05 | 3 | -13/+25 |