Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | unpack-trees: fix accidentally quadratic behaviordt/unpack-compare-entry-optim | David Turner | 2016-01-22 | 1 | -1/+12 |
* | do_compare_entry: use already-computed path | David Turner | 2016-01-05 | 3 | -2/+44 |
* | Merge branch 'fr/rebase-i-continue-preserve-options' | Junio C Hamano | 2015-12-16 | 2 | -11/+23 |
|\ | |||||
| * | rebase -i: remember merge options beyond continue actionsfr/rebase-i-continue-preserve-options | Fabian Ruch | 2015-12-11 | 2 | -11/+23 |
* | | Merge branch 'maint' | Junio C Hamano | 2015-12-16 | 1 | -2/+1 |
|\ \ | |||||
| * \ | Merge branch 'sg/lock-file-commit-error' into maint | Junio C Hamano | 2015-12-16 | 1 | -2/+1 |
| |\ \ | |||||
| | * | | credential-store: don't pass strerror to die_errno()sg/lock-file-commit-error | SZEDER Gábor | 2015-12-16 | 1 | -2/+1 |
* | | | | Git 2.7-rc1v2.7.0-rc1 | Junio C Hamano | 2015-12-15 | 2 | -8/+14 |
* | | | | Sync with maint | Junio C Hamano | 2015-12-15 | 1 | -0/+14 |
|\ \ \ \ | |/ / / | |||||
| * | | | Update draft release notes to 2.6.5 | Junio C Hamano | 2015-12-15 | 1 | -0/+14 |
| * | | | Merge branch 'dt/fsck-verify-pack-error' into maint | Junio C Hamano | 2015-12-15 | 1 | -1/+1 |
| |\ \ \ | |||||
| * \ \ \ | Merge branch 'ep/ident-with-getaddrinfo' into maint | Junio C Hamano | 2015-12-15 | 1 | -4/+27 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'ls/p4-keep-empty-commits' into maint | Junio C Hamano | 2015-12-15 | 3 | -17/+165 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'jk/prune-mtime' into maint | Junio C Hamano | 2015-12-15 | 1 | -2/+2 |
| |\ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | | |||||
* | | | | | | | Merge branch 'jk/send-email-complete-aliases' | Junio C Hamano | 2015-12-15 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | completion: fix completing unstuck email alias argumentsjk/send-email-complete-aliases | SZEDER Gábor | 2015-12-14 | 1 | -1/+1 |
* | | | | | | | | Merge branch 'ep/ident-with-getaddrinfo' | Junio C Hamano | 2015-12-15 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | | | |||||
| * | | | | | | | ident: fix undefined variable when NO_IPV6 is setep/ident-with-getaddrinfo | Jeff King | 2015-12-14 | 1 | -1/+1 |
* | | | | | | | | Merge branch 'ls/p4-keep-empty-commits' | Junio C Hamano | 2015-12-15 | 3 | -17/+165 |
|\ \ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | | | |||||
| * | | | | | | | git-p4: add option to keep empty commitsls/p4-keep-empty-commits | Lars Schneider | 2015-12-10 | 3 | -17/+165 |
* | | | | | | | | Merge branch 'jk/prune-mtime' | Junio C Hamano | 2015-12-15 | 1 | -2/+2 |
|\ \ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | | | |||||
| * | | | | | | | prune: close directory earlier during loose-object directory traversaljk/prune-mtime | Johannes Sixt | 2015-08-12 | 1 | -2/+2 |
* | | | | | | | | Update release notes to 2.7 | Junio C Hamano | 2015-12-11 | 1 | -65/+1 |
* | | | | | | | | Merge branch 'maint' | Junio C Hamano | 2015-12-11 | 1 | -0/+25 |
|\ \ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | | | |||||
| * | | | | | | | Prepare for 2.6.5 | Junio C Hamano | 2015-12-11 | 2 | -1/+26 |
| * | | | | | | | Merge branch 'sn/null-pointer-arith-in-mark-tree-uninteresting' into maint | Junio C Hamano | 2015-12-11 | 1 | -1/+3 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge branch 'sg/lock-file-commit-error' into maint | Junio C Hamano | 2015-12-11 | 4 | -5/+8 |
| |\ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ | | |/| | | | | | | |||||
| * | | | | | | | | Merge branch 'cb/t3404-shellquote' into maint | Junio C Hamano | 2015-12-11 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Merge branch 'sb/doc-submodule-sync-recursive' into maint | Junio C Hamano | 2015-12-11 | 1 | -1/+4 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ | Merge branch 'nd/doc-check-ref-format-typo' into maint | Junio C Hamano | 2015-12-11 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ | Merge branch 'rs/show-branch-argv-array' into maint | Junio C Hamano | 2015-12-11 | 1 | -16/+8 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'rs/pop-commit' into maint | Junio C Hamano | 2015-12-11 | 10 | -92/+31 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'as/subtree-with-spaces' into maint | Junio C Hamano | 2015-12-11 | 2 | -74/+124 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/test-lint-forbid-when-finished-in-subshell' into maint | Junio C Hamano | 2015-12-11 | 4 | -16/+31 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'sn/null-pointer-arith-in-mark-tree-uninteresting' | Junio C Hamano | 2015-12-11 | 1 | -1/+3 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | revision.c: fix possible null pointer arithmeticsn/null-pointer-arith-in-mark-tree-uninteresting | Stefan Naewe | 2015-12-07 | 1 | -1/+3 |
* | | | | | | | | | | | | | | | | Merge branch 'sb/doc-submodule-sync-recursive' | Junio C Hamano | 2015-12-11 | 1 | -1/+4 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | document submodule sync --recursivesb/doc-submodule-sync-recursive | Stefan Beller | 2015-12-04 | 1 | -1/+4 |
| |/ / / / / / / / / / / / / / | |||||
* | | | | | | | | | | | | | | | Merge branch 'cb/t3404-shellquote' | Junio C Hamano | 2015-12-11 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | t3404: fix quoting of redirect for some versions of bashcb/t3404-shellquote | Charles Bailey | 2015-12-04 | 1 | -1/+1 |
* | | | | | | | | | | | | | | | Merge branch 'sg/lock-file-commit-error' | Junio C Hamano | 2015-12-11 | 4 | -5/+8 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | Make error message after failing commit_lock_file() less confusing | SZEDER Gábor | 2015-12-01 | 4 | -5/+8 |
* | | | | | | | | | | | | | | | Git 2.7-rc0v2.7.0-rc0 | Junio C Hamano | 2015-12-10 | 1 | -1/+1 |
* | | | | | | | | | | | | | | | Sync with maint | Junio C Hamano | 2015-12-10 | 1 | -0/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | Documentation/git-update-index: add missing opts to synopsis | Christian Couder | 2015-12-10 | 1 | -0/+1 |
* | | | | | | | | | | | | | | | Update release notes to 2.7 | Junio C Hamano | 2015-12-10 | 1 | -0/+19 |
* | | | | | | | | | | | | | | | Merge branch 'nd/doc-check-ref-format-typo' | Junio C Hamano | 2015-12-10 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | git-check-ref-format.txt: typo, s/avoids/avoid/nd/doc-check-ref-format-typo | Nguyễn Thái Ngọc Duy | 2015-12-04 | 1 | -1/+1 |
| | |_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | Merge branch 'bc/object-id' | Junio C Hamano | 2015-12-10 | 88 | -704/+716 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | remote: convert functions to struct object_id | brian m. carlson | 2015-11-20 | 1 | -29/+29 |