summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* 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-161-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 readablegb/filter-branch-progressJunio C Hamano2015-09-211-7/+9
| * | filter-branch: add passed/remaining seconds on progressGabor Bernat2015-09-211-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 matchnd/ignore-then-not-ignoreNguyễ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 handlersti/glibc-stdio-mutex-from-signal-handlerTakashi 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-284-3/+22
| * | | Sync with v2.5.4Junio C Hamano2015-09-2829-30/+486
| |\ \ \
| | * | | Git 2.5.4v2.5.4Junio C Hamano2015-09-284-3/+22
| | * | | Sync with 2.4.10Junio C Hamano2015-09-2828-29/+466
| | |\ \ \
| | | * | | Git 2.4.10v2.4.10Junio C Hamano2015-09-284-3/+22
| | | * | | Sync with 2.3.10Junio C Hamano2015-09-2827-28/+446
| | | |\ \ \
| | | | * | | Git 2.3.10v2.3.10maint-2.3Junio C Hamano2015-09-284-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-253-0/+8
| | | | | * | | http: limit redirection to protocol-whitelistBlake Burkhart2015-09-254-5/+27
| | | | | * | | transport: refactor protocol whitelist codeJeff King2015-09-252-10/+43
| | | | * | | | Merge branch 'jk/transfer-limit-protocol' into maint-2.3Junio C Hamano2015-09-2813-1/+306
| | | | |\ \ \ \ | | | | | |/ / / | | | | | | / / | | | | | |/ / | | | | |/| |
| | | | | * | submodule: allow only certain protocols for submodule fetchesJeff King2015-09-232-0/+52
| | | | | * | transport: add a protocol-whitelist environment variableJeff King2015-09-2311-1/+254
| | | | |/ /
* | | | | | Merge branch 'mm/keyid-docs'Junio C Hamano2015-10-0510-29/+47
|\ \ \ \ \ \
| * | | | | | Documentation: explain optional arguments bettermm/keyid-docsMatthieu Moy2015-09-219-10/+28
| * | | | | | Documentation/grep: fix documentation of -OMatthieu Moy2015-09-211-2/+2
| * | | | | | Documentation: use 'keyid' consistently, not 'key-id'Matthieu Moy2015-09-215-17/+17
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'bb/remote-get-url'Junio C Hamano2015-10-053-0/+106
|\ \ \ \ \ \
| * | | | | | remote: add get-url subcommandbb/remote-get-urlBen Boeckel2015-09-173-0/+106
| | |_|_|_|/ | |/| | | |
* | | | | | Merge branch 'jk/blame-first-parent'Junio C Hamano2015-10-052-1/+14
|\ \ \ \ \ \
| * | | | | | blame: handle --first-parentjk/blame-first-parentJeff King2015-09-162-1/+14
* | | | | | | Merge branch 'jw/make-arflags-customizable'Junio C Hamano2015-10-051-3/+6
|\ \ \ \ \ \ \
| * | | | | | | Makefile: allow $(ARFLAGS) specified from the command linejw/make-arflags-customizableJunio C Hamano2015-09-101-3/+6
* | | | | | | | Merge branch 'jk/rebase-no-autostash'Junio C Hamano2015-10-053-2/+16
|\ \ \ \ \ \ \ \
| * | | | | | | | Documentation/git-rebase: fix --no-autostash formattingjk/rebase-no-autostashJohn Keeping2015-09-101-1/+2
| * | | | | | | | rebase: support --no-autostashJohn Keeping2015-09-102-1/+14
* | | | | | | | | Merge branch 'jk/make-findstring-makeflags-fix'Junio C Hamano2015-10-051-2/+2
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Makefile: fix MAKEFLAGS tests with multiple flagsjk/make-findstring-makeflags-fixJohn Keeping2015-09-101-2/+2
* | | | | | | | | | Merge branch 'sb/submodule-helper'Junio C Hamano2015-10-056-149/+301
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | submodule: rewrite `module_clone` shell function in Csb/submodule-helperStefan Beller2015-09-082-76/+134
| * | | | | | | | | | submodule: rewrite `module_name` shell function in CStefan Beller2015-09-032-25/+29