aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* do_compare_entry: use already-computed pathDavid Turner2016-01-05
* Merge branch 'fr/rebase-i-continue-preserve-options'Junio C Hamano2015-12-16
|\
| * rebase -i: remember merge options beyond continue actionsFabian Ruch2015-12-11
* | Merge branch 'maint'Junio C Hamano2015-12-16
|\ \
| * \ Merge branch 'sg/lock-file-commit-error' into maintJunio C Hamano2015-12-16
| |\ \
| | * | credential-store: don't pass strerror to die_errno()SZEDER Gábor2015-12-16
* | | | Git 2.7-rc1v2.7.0-rc1Junio C Hamano2015-12-15
* | | | Sync with maintJunio C Hamano2015-12-15
|\ \ \ \ | |/ / /
| * | | Update draft release notes to 2.6.5Junio C Hamano2015-12-15
| * | | Merge branch 'dt/fsck-verify-pack-error' into maintJunio C Hamano2015-12-15
| |\ \ \
| * \ \ \ Merge branch 'ep/ident-with-getaddrinfo' into maintJunio C Hamano2015-12-15
| |\ \ \ \
| * \ \ \ \ Merge branch 'ls/p4-keep-empty-commits' into maintJunio C Hamano2015-12-15
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'jk/prune-mtime' into maintJunio C Hamano2015-12-15
| |\ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge branch 'jk/send-email-complete-aliases'Junio C Hamano2015-12-15
|\ \ \ \ \ \ \
| * | | | | | | completion: fix completing unstuck email alias argumentsSZEDER Gábor2015-12-14
* | | | | | | | Merge branch 'ep/ident-with-getaddrinfo'Junio C Hamano2015-12-15
|\ \ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | |
| * | | | | | | ident: fix undefined variable when NO_IPV6 is setJeff King2015-12-14
* | | | | | | | Merge branch 'ls/p4-keep-empty-commits'Junio C Hamano2015-12-15
|\ \ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | |
| * | | | | | | git-p4: add option to keep empty commitsLars Schneider2015-12-10
* | | | | | | | Merge branch 'jk/prune-mtime'Junio C Hamano2015-12-15
|\ \ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | |
| * | | | | | | prune: close directory earlier during loose-object directory traversalJohannes Sixt2015-08-12
* | | | | | | | Update release notes to 2.7Junio C Hamano2015-12-11
* | | | | | | | Merge branch 'maint'Junio C Hamano2015-12-11
|\ \ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | |
| * | | | | | | Prepare for 2.6.5Junio C Hamano2015-12-11
| * | | | | | | Merge branch 'sn/null-pointer-arith-in-mark-tree-uninteresting' into maintJunio C Hamano2015-12-11
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'sg/lock-file-commit-error' into maintJunio C Hamano2015-12-11
| |\ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ | | |/| | | | | |
| * | | | | | | | Merge branch 'cb/t3404-shellquote' into maintJunio C Hamano2015-12-11
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'sb/doc-submodule-sync-recursive' into maintJunio C Hamano2015-12-11
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'nd/doc-check-ref-format-typo' into maintJunio C Hamano2015-12-11
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'rs/show-branch-argv-array' into maintJunio C Hamano2015-12-11
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'rs/pop-commit' into maintJunio C Hamano2015-12-11
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'as/subtree-with-spaces' into maintJunio C Hamano2015-12-11
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/test-lint-forbid-when-finished-in-subshell' into maintJunio C Hamano2015-12-11
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'sn/null-pointer-arith-in-mark-tree-uninteresting'Junio C Hamano2015-12-11
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | revision.c: fix possible null pointer arithmeticStefan Naewe2015-12-07
* | | | | | | | | | | | | | | | Merge branch 'sb/doc-submodule-sync-recursive'Junio C Hamano2015-12-11
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | document submodule sync --recursiveStefan Beller2015-12-04
| |/ / / / / / / / / / / / / /
* | | | | | | | | | | | | | | Merge branch 'cb/t3404-shellquote'Junio C Hamano2015-12-11
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | t3404: fix quoting of redirect for some versions of bashCharles Bailey2015-12-04
* | | | | | | | | | | | | | | Merge branch 'sg/lock-file-commit-error'Junio C Hamano2015-12-11
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | Make error message after failing commit_lock_file() less confusingSZEDER Gábor2015-12-01
* | | | | | | | | | | | | | | Git 2.7-rc0v2.7.0-rc0Junio C Hamano2015-12-10
* | | | | | | | | | | | | | | Sync with maintJunio C Hamano2015-12-10
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | Documentation/git-update-index: add missing opts to synopsisChristian Couder2015-12-10
* | | | | | | | | | | | | | | Update release notes to 2.7Junio C Hamano2015-12-10
* | | | | | | | | | | | | | | Merge branch 'nd/doc-check-ref-format-typo'Junio C Hamano2015-12-10
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | git-check-ref-format.txt: typo, s/avoids/avoid/Nguyễn Thái Ngọc Duy2015-12-04
| | |_|_|/ / / / / / / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'bc/object-id'Junio C Hamano2015-12-10
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | remote: convert functions to struct object_idbrian m. carlson2015-11-20
| * | | | | | | | | | | | | | Remove get_object_hash.brian m. carlson2015-11-20