Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | mv: allow moving nested submodulessb/mv-submodule-fix | Stefan Beller | 2016-04-19 | 2 | -9/+28 |
* | Git 2.6.6v2.6.6 | Junio C Hamano | 2016-03-17 | 4 | -3/+15 |
* | Merge branch 'maint-2.5' into maint-2.6 | Junio C Hamano | 2016-03-17 | 16 | -148/+110 |
|\ | |||||
| * | Git 2.5.5v2.5.5 | Junio C Hamano | 2016-03-17 | 4 | -3/+15 |
| * | Merge branch 'maint-2.4' into maint-2.5 | Junio C Hamano | 2016-03-17 | 15 | -147/+97 |
| |\ | |||||
| | * | Git 2.4.11v2.4.11 | Junio C Hamano | 2016-03-17 | 4 | -3/+15 |
| | * | Merge branch 'jk/path-name-safety-2.4' into maint-2.4 | Junio C Hamano | 2016-03-17 | 13 | -146/+84 |
| | |\ | |||||
| | | * | list-objects: pass full pathname to callbacksjk/path-name-safety-2.4 | Jeff King | 2016-03-16 | 9 | -58/+26 |
| | | * | list-objects: drop name_path entirely | Jeff King | 2016-03-16 | 9 | -25/+19 |
| | | * | list-objects: convert name_path to a strbuf | Jeff King | 2016-03-16 | 3 | -36/+15 |
| | | * | show_object_with_name: simplify by using path_name() | Jeff King | 2016-03-16 | 1 | -34/+6 |
| | | * | http-push: stop using name_path | Jeff King | 2016-03-16 | 1 | -16/+7 |
| | | * | tree-diff: catch integer overflow in combine_diff_path allocation | Jeff King | 2016-03-16 | 2 | -4/+4 |
| | | * | add helpers for detecting size_t overflow | Jeff King | 2016-03-16 | 1 | -0/+34 |
| | |/ | |||||
* | | | Git 2.6.5v2.6.5 | Junio C Hamano | 2016-01-04 | 3 | -2/+22 |
* | | | Merge branch 'jk/pending-keep-tag-name' into maint | Junio C Hamano | 2016-01-04 | 2 | -2/+30 |
|\ \ \ | |||||
| * | | | revision.c: propagate tag names from pending arrayjk/pending-keep-tag-name | Jeff King | 2015-12-17 | 2 | -2/+30 |
* | | | | Merge branch 'jk/symbolic-ref-maint' into maint | Junio C Hamano | 2016-01-04 | 2 | -1/+23 |
|\ \ \ \ | |||||
| * | | | | t1401: test reflog creation for git-symbolic-refjk/symbolic-ref-maint | Jeff King | 2015-12-21 | 1 | -0/+16 |
| * | | | | symbolic-ref: propagate error code from create_symref() | Jeff King | 2015-12-21 | 2 | -1/+7 |
| | |_|/ | |/| | | |||||
* | | | | Merge branch 'jk/ident-loosen-getpwuid' into maint | Junio C Hamano | 2016-01-04 | 3 | -24/+40 |
|\ \ \ \ | |||||
| * | | | | ident: loosen getpwuid error in non-strict modejk/ident-loosen-getpwuid | Jeff King | 2015-12-14 | 1 | -8/+22 |
| * | | | | ident: keep a flag for bogus default_email | Jeff King | 2015-12-10 | 1 | -7/+12 |
| * | | | | ident: make xgetpwuid_self() a static local helper | Jeff King | 2015-12-10 | 3 | -15/+12 |
* | | | | | Merge branch 'jk/send-email-ssl-errors' into maint | Junio C Hamano | 2016-01-04 | 1 | -0/+7 |
|\ \ \ \ \ | |||||
| * | | | | | send-email: enable SSL level 1 debug outputjk/send-email-ssl-errors | John Keeping | 2015-12-11 | 1 | -0/+7 |
* | | | | | | Merge branch 'sg/completion-no-column' into maint | Junio C Hamano | 2016-01-04 | 1 | -0/+1 |
|\ \ \ \ \ \ | |||||
| * | | | | | | completion: remove 'git column' from porcelain commandssg/completion-no-column | SZEDER Gábor | 2015-12-11 | 1 | -0/+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 |
* | | | | | | | 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 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | verify_pack: do not ignore return value of verification functiondt/fsck-verify-pack-error | David Turner | 2015-12-01 | 1 | -1/+1 |
* | | | | | | | | Merge branch 'ep/ident-with-getaddrinfo' into maint | Junio C Hamano | 2015-12-15 | 1 | -4/+27 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | ident: fix undefined variable when NO_IPV6 is setep/ident-with-getaddrinfo | Jeff King | 2015-12-14 | 1 | -1/+1 |
| * | | | | | | | | ident.c: add support for IPv6 | Elia Pinto | 2015-11-28 | 1 | -4/+27 |
* | | | | | | | | | Merge branch 'ls/p4-keep-empty-commits' into maint | 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' into maint | 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 |
* | | | | | | | | | | | 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 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | revision.c: fix possible null pointer arithmeticsn/null-pointer-arith-in-mark-tree-uninteresting | Stefan Naewe | 2015-12-07 | 1 | -1/+3 |
| | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | |||||
* | | | | | | | | | | | Merge branch 'sg/lock-file-commit-error' into maint | 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 |
| | |_|_|_|/ / / / / | |/| | | | | | | | | |||||
* | | | | | | | | | | Merge branch 'cb/t3404-shellquote' into maint | 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 'sb/doc-submodule-sync-recursive' into maint | 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 'nd/doc-check-ref-format-typo' into maint | Junio C Hamano | 2015-12-11 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ |