summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* merge-file: ensure that conflict sections match eol stylejs/xmerge-marker-eolJohannes Schindelin2016-01-272-15/+25
* merge-file: let conflict markers match end-of-line style of the contextJohannes Schindelin2016-01-272-4/+69
* Git 2.6.5v2.6.5Junio C Hamano2016-01-043-2/+22
* Merge branch 'jk/pending-keep-tag-name' into maintJunio C Hamano2016-01-042-2/+30
|\
| * revision.c: propagate tag names from pending arrayjk/pending-keep-tag-nameJeff King2015-12-172-2/+30
* | Merge branch 'jk/symbolic-ref-maint' into maintJunio C Hamano2016-01-042-1/+23
|\ \
| * | t1401: test reflog creation for git-symbolic-refjk/symbolic-ref-maintJeff King2015-12-211-0/+16
| * | symbolic-ref: propagate error code from create_symref()Jeff King2015-12-212-1/+7
* | | Merge branch 'jk/ident-loosen-getpwuid' into maintJunio C Hamano2016-01-043-24/+40
|\ \ \
| * | | ident: loosen getpwuid error in non-strict modejk/ident-loosen-getpwuidJeff King2015-12-141-8/+22
| * | | ident: keep a flag for bogus default_emailJeff King2015-12-101-7/+12
| * | | ident: make xgetpwuid_self() a static local helperJeff King2015-12-103-15/+12
* | | | Merge branch 'jk/send-email-ssl-errors' into maintJunio C Hamano2016-01-041-0/+7
|\ \ \ \
| * | | | send-email: enable SSL level 1 debug outputjk/send-email-ssl-errorsJohn Keeping2015-12-111-0/+7
* | | | | Merge branch 'sg/completion-no-column' into maintJunio C Hamano2016-01-041-0/+1
|\ \ \ \ \
| * | | | | completion: remove 'git column' from porcelain commandssg/completion-no-columnSZEDER Gábor2015-12-111-0/+1
| | |_|/ / | |/| | |
* | | | | Merge branch 'sg/lock-file-commit-error' into maintJunio C Hamano2015-12-161-2/+1
|\ \ \ \ \
| * | | | | credential-store: don't pass strerror to die_errno()sg/lock-file-commit-errorSZEDER Gábor2015-12-161-2/+1
* | | | | | Update draft release notes to 2.6.5Junio C Hamano2015-12-151-0/+14
* | | | | | Merge branch 'dt/fsck-verify-pack-error' into maintJunio C Hamano2015-12-151-1/+1
|\ \ \ \ \ \
| * | | | | | verify_pack: do not ignore return value of verification functiondt/fsck-verify-pack-errorDavid Turner2015-12-011-1/+1
* | | | | | | Merge branch 'ep/ident-with-getaddrinfo' into maintJunio C Hamano2015-12-151-4/+27
|\ \ \ \ \ \ \
| * | | | | | | ident: fix undefined variable when NO_IPV6 is setep/ident-with-getaddrinfoJeff King2015-12-141-1/+1
| * | | | | | | ident.c: add support for IPv6Elia Pinto2015-11-281-4/+27
* | | | | | | | Merge branch 'ls/p4-keep-empty-commits' into maintJunio C Hamano2015-12-153-17/+165
|\ \ \ \ \ \ \ \
| * | | | | | | | git-p4: add option to keep empty commitsls/p4-keep-empty-commitsLars Schneider2015-12-103-17/+165
* | | | | | | | | Merge branch 'jk/prune-mtime' into maintJunio C Hamano2015-12-151-2/+2
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | prune: close directory earlier during loose-object directory traversaljk/prune-mtimeJohannes Sixt2015-08-121-2/+2
* | | | | | | | | | Prepare for 2.6.5Junio C Hamano2015-12-112-1/+26
* | | | | | | | | | Merge branch 'sn/null-pointer-arith-in-mark-tree-uninteresting' into maintJunio C Hamano2015-12-111-1/+3
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | revision.c: fix possible null pointer arithmeticsn/null-pointer-arith-in-mark-tree-uninterestingStefan Naewe2015-12-071-1/+3
* | | | | | | | | | | Merge branch 'sg/lock-file-commit-error' into maintJunio C Hamano2015-12-114-5/+8
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / | |/| | | | | | | | |
| * | | | | | | | | | Make error message after failing commit_lock_file() less confusingSZEDER Gábor2015-12-014-5/+8
| | |_|_|_|/ / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'cb/t3404-shellquote' into maintJunio C Hamano2015-12-111-1/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | t3404: fix quoting of redirect for some versions of bashcb/t3404-shellquoteCharles Bailey2015-12-041-1/+1
* | | | | | | | | | | Merge branch 'sb/doc-submodule-sync-recursive' into maintJunio C Hamano2015-12-111-1/+4
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | document submodule sync --recursivesb/doc-submodule-sync-recursiveStefan Beller2015-12-041-1/+4
| | |_|/ / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'nd/doc-check-ref-format-typo' into maintJunio C Hamano2015-12-111-1/+1
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | git-check-ref-format.txt: typo, s/avoids/avoid/nd/doc-check-ref-format-typoNguyễn Thái Ngọc Duy2015-12-041-1/+1
| |/ / / / / / / / / /
* | | | | | | | | | | Merge branch 'rs/show-branch-argv-array' into maintJunio C Hamano2015-12-111-16/+8
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | show-branch: use argv_array for default argumentsrs/show-branch-argv-arrayRené Scharfe2015-11-011-16/+8
| | |_|_|_|_|_|/ / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'rs/pop-commit' into maintJunio C Hamano2015-12-1110-92/+31
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | use pop_commit() for consuming the first entry of a struct commit_listrs/pop-commitRené Scharfe2015-10-2610-92/+31
| | |/ / / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'as/subtree-with-spaces' into maintJunio C Hamano2015-12-112-74/+124
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | contrib/subtree: respect spaces in a repository pathas/subtree-with-spacesAlexey Shumkin2015-09-082-1/+48
| * | | | | | | | | | | t7900-subtree: test the "space in a subdirectory name" caseAlexey Shumkin2015-09-082-73/+76
* | | | | | | | | | | | Merge branch 'jk/test-lint-forbid-when-finished-in-subshell' into maintJunio C Hamano2015-12-114-16/+31
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | |
| * | | | | | | | | | | test-lib-functions: detect test_when_finished in subshelljk/test-lint-forbid-when-finished-in-subshellJohn Keeping2015-09-081-0/+5
| * | | | | | | | | | | t7800: don't use test_config in a subshellJohn Keeping2015-09-081-4/+4
| * | | | | | | | | | | test-lib-functions: support "test_config -C <dir> ..."John Keeping2015-09-081-3/+17
View Lorry Controller Status