summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* status: suggest 'git merge --abort' when appropriatemm/status-suggest-merge-abortMatthieu Moy2016-07-223-2/+10
* Git 2.6.6v2.6.6Junio C Hamano2016-03-174-3/+15
* Merge branch 'maint-2.5' into maint-2.6Junio C Hamano2016-03-1716-148/+110
|\
| * Git 2.5.5v2.5.5Junio C Hamano2016-03-174-3/+15
| * Merge branch 'maint-2.4' into maint-2.5Junio C Hamano2016-03-1715-147/+97
| |\
| | * Git 2.4.11v2.4.11Junio C Hamano2016-03-174-3/+15
| | * Merge branch 'jk/path-name-safety-2.4' into maint-2.4Junio C Hamano2016-03-1713-146/+84
| | |\
| | | * list-objects: pass full pathname to callbacksjk/path-name-safety-2.4Jeff King2016-03-169-58/+26
| | | * list-objects: drop name_path entirelyJeff King2016-03-169-25/+19
| | | * list-objects: convert name_path to a strbufJeff King2016-03-163-36/+15
| | | * show_object_with_name: simplify by using path_name()Jeff King2016-03-161-34/+6
| | | * http-push: stop using name_pathJeff King2016-03-161-16/+7
| | | * tree-diff: catch integer overflow in combine_diff_path allocationJeff King2016-03-162-4/+4
| | | * add helpers for detecting size_t overflowJeff King2016-03-161-0/+34
| | |/
* | | 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
|\ \ \ \ \ \ \ \ \ \ \
View Lorry Controller Status