Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | alternates: re-allow relative paths from environmentjk/alt-odb-cleanup | Jeff King | 2016-11-08 | 2 | -1/+72 |
* | 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 |
* | Sync with 2.10.1 | Junio C Hamano | 2016-10-03 | 2 | -1/+13 |
|\ | |||||
| * | Git 2.10.1v2.10.1 | Junio C Hamano | 2016-10-03 | 3 | -2/+14 |
| * | Merge branch 'jk/ident-ai-canonname-could-be-null' into maint | Junio C Hamano | 2016-10-03 | 1 | -1/+1 |
| |\ | |||||
| * \ | Merge branch 'jk/doc-cvs-update' into maint | Junio C Hamano | 2016-10-03 | 2 | -2/+6 |
| |\ \ | |||||
| * \ \ | Merge branch 'jk/pack-tag-of-tag' into maint | Junio C Hamano | 2016-10-03 | 2 | -30/+95 |
| |\ \ \ | |||||
* | | | | | Seventh batch for 2.11 | Junio C Hamano | 2016-10-03 | 1 | -0/+40 |
* | | | | | Merge branch 'pb/rev-list-reverse-with-count' | Junio C Hamano | 2016-10-03 | 1 | -2/+3 |
|\ \ \ \ \ | |||||
| * | | | | | rev-list-options: clarify the usage of --reversepb/rev-list-reverse-with-count | Pranit Bauva | 2016-09-27 | 1 | -2/+3 |
* | | | | | | Merge branch 'dt/tree-fsck' | Junio C Hamano | 2016-10-03 | 5 | -20/+130 |
|\ \ \ \ \ \ | |||||
| * | | | | | | fsck: handle bad trees like other errorsdt/tree-fsck | David Turner | 2016-09-27 | 4 | -19/+106 |
| * | | | | | | tree-walk: be more specific about corrupt tree errors | Jeff King | 2016-09-27 | 2 | -7/+30 |
* | | | | | | | Merge branch 'kd/mailinfo-quoted-string' | Junio C Hamano | 2016-10-03 | 6 | -33/+159 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | mailinfo: unescape quoted-pair in header fieldskd/mailinfo-quoted-string | Kevin Daudt | 2016-09-28 | 6 | -0/+124 |
| * | | | | | | | t5100-mailinfo: replace common path prefix with variable | Kevin Daudt | 2016-09-28 | 1 | -33/+35 |
* | | | | | | | | Merge branch 'mh/diff-indent-heuristic' | Junio C Hamano | 2016-10-03 | 1 | -7/+7 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | xdiff: rename "struct group" to "struct xdlgroup"mh/diff-indent-heuristic | Jeff King | 2016-09-27 | 1 | -7/+7 |
* | | | | | | | | | Merge branch 'dt/mailinfo' | Junio C Hamano | 2016-10-03 | 1 | -0/+1 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | add David Turner's Two Sigma addressdt/mailinfo | David Turner | 2016-09-26 | 1 | -0/+1 |
| | |/ / / / / / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch 'va/git-gui-i18n' | Junio C Hamano | 2016-10-03 | 3 | -3/+3012 |
|\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Merge branch 'va/i18n' of ../git-gui into va/git-gui-i18nva/git-gui-i18n | Junio C Hamano | 2016-09-26 | 3 | -3/+3012 |
| |\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / | |/| | | | | | | | | |||||
| | * | | | | | | | | git-gui: l10n: add Portuguese translation | Vasco Almeida | 2016-09-26 | 2 | -0/+3009 |
| | * | | | | | | | | git-gui i18n: mark strings for translation | Vasco Almeida | 2016-09-26 | 1 | -3/+3 |
* | | | | | | | | | | Merge branch 'rs/git-gui-use-modern-git-merge-syntax' | Junio C Hamano | 2016-10-03 | 1 | -6/+1 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ | Merge branch 'rs/use-modern-git-merge-syntax' of git-gui into rs/git-gui-use-...rs/git-gui-use-modern-git-merge-syntax | Junio C Hamano | 2016-09-26 | 1 | -6/+1 |
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / | |/| | | | | | | | | | |||||
| | * | | | | | | | | | git-gui: stop using deprecated merge syntax | René Scharfe | 2016-09-26 | 1 | -6/+1 |
| | | |/ / / / / / / | | |/| | | | | | | | |||||
* | | | | | | | | | | Merge branch 'jc/verify-loose-object-header' | Junio C Hamano | 2016-10-03 | 2 | -8/+30 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | unpack_sha1_header(): detect malformed object headerjc/verify-loose-object-header | Junio C Hamano | 2016-09-26 | 1 | -2/+24 |
| * | | | | | | | | | | streaming: make sure to notice corrupt object | Junio C Hamano | 2016-09-26 | 1 | -6/+6 |
* | | | | | | | | | | | Merge branch 'nd/init-core-worktree-in-multi-worktree-world' | Junio C Hamano | 2016-10-03 | 4 | -50/+57 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | init: kill git_link variablend/init-core-worktree-in-multi-worktree-world | Nguyễn Thái Ngọc Duy | 2016-09-25 | 1 | -12/+4 |
| * | | | | | | | | | | | init: do not set unnecessary core.worktree | Nguyễn Thái Ngọc Duy | 2016-09-25 | 2 | -3/+8 |