summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* diff: --ignore-cr-at-eoljc/ignore-cr-at-eolJunio C Hamano2017-11-088-6/+78
* xdiff: reassign xpparm_t.flags bitsJunio C Hamano2017-10-272-13/+15
* Git 2.13.6v2.13.6maint-2.13Junio C Hamano2017-09-223-2/+19
* Sync with 2.12.5Junio C Hamano2017-09-229-56/+155
|\
| * Git 2.12.5v2.12.5maint-2.12Junio C Hamano2017-09-223-2/+19
| * Sync with 2.11.4Junio C Hamano2017-09-228-56/+138
| |\
| | * Git 2.11.4v2.11.4maint-2.11Junio C Hamano2017-09-223-2/+19
| | * Sync with 2.10.5Junio C Hamano2017-09-227-56/+121
| | |\
| | | * Git 2.10.5v2.10.5maint-2.10Junio C Hamano2017-09-223-2/+19
| | | * Merge branch 'jk/safe-pipe-capture' into maint-2.10Junio C Hamano2017-09-221-2/+2
| | | |\
| | | | * archimport: use safe_pipe_capture for user inputjk/safe-pipe-captureJeff King2017-09-121-2/+2
| | | * | Merge branch 'jk/cvsimport-quoting' into maint-2.10Junio C Hamano2017-09-221-0/+1
| | | |\ \
| | | | * | cvsimport: shell-quote variable used in backticksJeff King2017-09-121-0/+1
| | | | |/
| | | * | Merge branch 'jc/cvsserver' into maint-2.10Junio C Hamano2017-09-221-40/+37
| | | |\ \
| | | | * | cvsserver: use safe_pipe_capture for `constant commands` as welljc/cvsserverJunio C Hamano2017-09-111-4/+4
| | | | * | cvsserver: use safe_pipe_capture instead of backticksjoernchen2017-09-111-11/+11
| | | | * | cvsserver: move safe_pipe_capture() to the main packageJunio C Hamano2017-09-111-25/+22
| | | | |/
| | | * | Merge branch 'jk/git-shell-drop-cvsserver' into maint-2.10Junio C Hamano2017-09-223-14/+64
| | | |\ \
| | | | * | shell: drop git-cvsserver support by defaultjk/git-shell-drop-cvsserverJeff King2017-09-123-14/+64
| | | | |/
* | | | | Git 2.13.5v2.13.5Junio C Hamano2017-08-013-2/+6
* | | | | Merge tag 'v2.12.4' into maintJunio C Hamano2017-08-0113-2/+126
|\ \ \ \ \ | |/ / / /
| * | | | Git 2.12.4v2.12.4Junio C Hamano2017-07-303-2/+6
| * | | | Merge tag 'v2.11.3' into maint-2.12Junio C Hamano2017-07-3011-0/+116
| |\ \ \ \ | | |/ / /
| | * | | Git 2.11.3v2.11.3Junio C Hamano2017-07-303-2/+6
| | * | | Merge tag 'v2.10.4' into maint-2.11Junio C Hamano2017-07-3010-0/+112
| | |\ \ \ | | | |/ /
| | | * | Git 2.10.4v2.10.4Junio C Hamano2017-07-303-2/+6
| | | * | Merge tag 'v2.9.5' into maint-2.10Junio C Hamano2017-07-309-0/+108
| | | |\ \ | | | | |/
| | | | * Git 2.9.5v2.9.5maint-2.9Junio C Hamano2017-07-303-2/+6
| | | | * Merge tag 'v2.8.6' into maint-2.9Junio C Hamano2017-07-308-0/+104
| | | | |\
| | | | | * Git 2.8.6v2.8.6maint-2.8Junio C Hamano2017-07-303-2/+6
| | | | | * Merge tag 'v2.7.6' into maint-2.8Junio C Hamano2017-07-307-0/+100
| | | | | |\
| | | | | | * Git 2.7.6v2.7.6maint-2.7Junio C Hamano2017-07-303-2/+27
| | | | | | * Merge branch 'jk/ssh-funny-url' into maint-2.7Junio C Hamano2017-07-286-0/+75
| | | | | | |\
| | | | | | | * connect: reject paths that look like command line optionsJeff King2017-07-283-0/+40
| | | | | | | * connect: reject dashed arguments for proxy commandsJeff King2017-07-282-0/+10
| | | | | | | * connect: factor out "looks like command line option" checkJeff King2017-07-283-1/+14
| | | | | | | * t5813: add test for hostname starting with dashJeff King2017-07-281-0/+9
| | | | | | | * connect: reject ssh hostname that begins with a dashJunio C Hamano2017-07-281-0/+3
| | | | | | |/
| * | | | | | Merge branch 'jk/lib-proto-disable-cleanup' into maint-2.12Junio C Hamano2017-07-301-2/+6
| |\ \ \ \ \ \
| | * | | | | | t/lib-proto-disable: restore protocol.allow after config testsJeff King2017-07-281-2/+6
| |/ / / / / /
* | | | | | | Git 2.13.4v2.13.4Junio C Hamano2017-08-011-1/+1
* | | | | | | Preparation for 2.13.4 continuesJunio C Hamano2017-07-311-0/+18
* | | | | | | Merge branch 'ks/doc-fixes' into maintJunio C Hamano2017-07-312-10/+11
|\ \ \ \ \ \ \
| * | | | | | | doc: reformat the paragraph containing the 'cut-line'ks/doc-fixesKaartic Sivaraam2017-07-181-5/+6
| * | | | | | | doc: camelCase the i18n config variables to improve readabilityKaartic Sivaraam2017-07-171-5/+5
* | | | | | | | Merge branch 'jk/test-copy-bytes-fix' into maintJunio C Hamano2017-07-311-0/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | t: handle EOF in test_copy_bytes()jk/test-copy-bytes-fixJeff King2017-07-171-0/+1
| |/ / / / / / /
* | | | | | | | Merge branch 'pw/unquote-path-in-git-pm' into maintJunio C Hamano2017-07-313-43/+61
|\ \ \ \ \ \ \ \
| * | | | | | | | t9700: add tests for Git::unquote_path()pw/unquote-path-in-git-pmPhillip Wood2017-06-301-0/+7
| * | | | | | | | Git::unquote_path(): throw an exception on bad pathPhillip Wood2017-06-301-2/+2