summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'ls/p4-translation-failure'Junio C Hamano2015-10-162-11/+66
|\
| * git-p4: handle "Translation of file content failed"Lars Schneider2015-09-222-12/+17
| * git-p4: add test case for "Translation of file content failed" errorLars Schneider2015-09-221-0/+50
* | Merge branch 'nd/gc-auto-background-fix'Junio C Hamano2015-10-161-1/+55
|\ \
| * | gc: save log from daemonized gc --auto and print it next timeNguyễn Thái Ngọc Duy2015-09-211-1/+55
* | | Merge branch 'mk/submodule-gitdir-path'Junio C Hamano2015-10-165-17/+41
|\ \ \
| * | | path: implement common_dir handling in git_pathdup_submodule()Max Kirillov2015-09-144-9/+41
| * | | submodule refactor: use strbuf_git_path_submodule() in add_submodule_odb()Max Kirillov2015-09-141-8/+1
* | | | Third batch for 2.7Junio C Hamano2015-10-141-0/+8
* | | | Merge branch 'pt/pull-builtin'Junio C Hamano2015-10-142-2/+2
|\ \ \ \
| * | | | merge: grammofix in please-commit-before-merge messageAlex Henrie2015-10-022-2/+2
* | | | | Merge branch 'nd/ls-remote-does-not-have-u-option'Junio C Hamano2015-10-142-3/+2
|\ \ \ \ \
| * | | | | ls-remote.txt: delete unsupported optionNguyễn Thái Ngọc Duy2015-09-282-3/+2
* | | | | | Merge branch 'jk/asciidoctor-section-heading-markup-fix'Junio C Hamano2015-10-142-2/+2
|\ \ \ \ \ \
| * | | | | | Documentation: fix section header mark-upJohn Keeping2015-09-252-2/+2
* | | | | | | Merge branch 'tk/typofix-connect-unknown-proto-error'Junio C Hamano2015-10-141-1/+1
|\ \ \ \ \ \ \
| * | | | | | | connect: fix typo in result string of prot_name()Tobias Klauser2015-09-251-1/+1
* | | | | | | | Merge branch 'jk/notes-dwim-doc'Junio C Hamano2015-10-143-3/+12
|\ \ \ \ \ \ \ \
| * | | | | | | | notes: correct documentation of DWIMery for notes referencesJacob Keller2015-09-233-3/+12
* | | | | | | | | git-multimail: update to release 1.2.0Matthieu Moy2015-10-129-226/+1218
* | | | | | | | | Second batch for 2.7Junio C Hamano2015-10-071-0/+16
* | | | | | | | | Merge branch 'ls/p4-path-encoding'Junio C Hamano2015-10-073-0/+75
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | git-p4: use replacement character for non UTF-8 characters in pathsLars Schneider2015-09-211-1/+1
| * | | | | | | | | git-p4: improve path encoding verbose outputLars Schneider2015-09-171-10/+9
| * | | | | | | | | git-p4: add config git-p4.pathEncodingLars Schneider2015-09-033-0/+76
* | | | | | | | | | Merge branch 'gb/filter-branch-progress'Junio C Hamano2015-10-071-1/+31
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | filter-branch: make report-progress more readableJunio C Hamano2015-09-221-7/+9
| * | | | | | | | | | filter-branch: add passed/remaining seconds on progressGabor Bernat2015-09-221-1/+29
| |/ / / / / / / / /
* | | | | | | | | | Merge branch 'nd/ignore-then-not-ignore'Junio C Hamano2015-10-073-10/+127
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | dir.c: don't exclude whole dir prematurely if neg pattern may matchNguyễn Thái Ngọc Duy2015-09-213-5/+117
| * | | | | | | | | | dir.c: make last_exclude_matching_from_list() run til the endNguyễn Thái Ngọc Duy2015-09-211-5/+10
| | |_|_|_|_|_|_|/ / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'ti/glibc-stdio-mutex-from-signal-handler'Junio C Hamano2015-10-073-14/+34
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | pager: don't use unsafe functions in signal handlersTakashi Iwai2015-09-043-14/+34
| | |/ / / / / / / / | |/| | | | | | | |
* | | | | | | | | | Start cycle toward 2.7Junio C Hamano2015-10-053-2/+111
* | | | | | | | | | Sync with 2.6.1Junio C Hamano2015-10-0531-32/+508
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Git 2.6.1v2.6.1Junio C Hamano2015-09-294-3/+22
| * | | | | | | | | | Sync with v2.5.4Junio C Hamano2015-09-2929-30/+486
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Git 2.5.4v2.5.4Junio C Hamano2015-09-294-3/+22
| | * | | | | | | | | | Sync with 2.4.10Junio C Hamano2015-09-2928-29/+466
| | |\ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / | | |/| | | | | | | | |
| | | * | | | | | | | | Git 2.4.10v2.4.10Junio C Hamano2015-09-294-3/+22
| | | * | | | | | | | | Sync with 2.3.10Junio C Hamano2015-09-2927-28/+446
| | | |\ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|/ / / / | | | |/| | | | | | | |
| | | | * | | | | | | | Git 2.3.10v2.3.10Junio C Hamano2015-09-294-3/+22
| | | | * | | | | | | | Merge branch 'jk/xdiff-memory-limits' into maint-2.3Junio C Hamano2015-09-2811-26/+57
| | | | |\ \ \ \ \ \ \ \
| | | | | * | | | | | | | merge-file: enforce MAX_XDIFF_SIZE on incoming filesJeff King2015-09-281-1/+2
| | | | | * | | | | | | | xdiff: reject files larger than ~1GBJeff King2015-09-283-1/+14
| | | | | * | | | | | | | react to errors in xdi_diffJeff King2015-09-287-24/+41
| | | | | | |/ / / / / / | | | | | |/| | | | | |
| | | | * | | | | | | | Merge branch 'jk/transfer-limit-redirection' into maint-2.3Junio C Hamano2015-09-286-15/+78
| | | | |\ \ \ \ \ \ \ \
| | | | | * | | | | | | | http: limit redirection depthBlake Burkhart2015-09-263-0/+8
| | | | | * | | | | | | | http: limit redirection to protocol-whitelistBlake Burkhart2015-09-264-5/+27
| | | | | * | | | | | | | transport: refactor protocol whitelist codeJeff King2015-09-262-10/+43