summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* merge: use skip_prefix()rs/merge-microcleanupRené Scharfe2017-08-101-2/+2
* 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
| * | | | | | | | Git::unquote_path(): handle '\a'Phillip Wood2017-06-301-1/+2
| * | | | | | | | add -i: move unquote_path() to Git.pmPhillip Wood2017-06-302-43/+53
* | | | | | | | | Merge branch 'jk/gc-pre-detach-under-hook' into maintJunio C Hamano2017-07-312-0/+25
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | gc: run pre-detach operations under lockjk/gc-pre-detach-under-hookJeff King2017-07-122-0/+25
* | | | | | | | | | Merge branch 'jn/hooks-pre-rebase-sample-fix' into maintJunio C Hamano2017-07-311-3/+3
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | pre-rebase hook: capture documentation in a <<here documentjn/hooks-pre-rebase-sample-fixJonathan Nieder2017-07-111-3/+3
| | |_|_|/ / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'rs/progress-overall-throughput-at-the-end' into maintJunio C Hamano2017-07-311-2/+6
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | progress: show overall rate in last updaters/progress-overall-throughput-at-the-endRené Scharfe2017-07-091-2/+6
* | | | | | | | | | | Merge branch 'tb/push-to-cygwin-unc-path' into maintJunio C Hamano2017-07-315-0/+27
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | cygwin: allow pushing to UNC pathstb/push-to-cygwin-unc-pathTorsten Bögershausen2017-07-055-0/+27
| |/ / / / / / / / / /
* | | | | | | | | | | Merge branch 'rs/apply-avoid-over-reading' into maintJunio C Hamano2017-07-311-4/+2
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | apply: use strcmp(3) for comparing strings in gitdiff_verify_name()rs/apply-avoid-over-readingRené Scharfe2017-07-091-2/+1
| * | | | | | | | | | | apply: use starts_with() in gitdiff_verify_name()René Scharfe2017-07-011-2/+1
* | | | | | | | | | | | fixes from 'master' for 2.13.4Junio C Hamano2017-07-212-1/+11
* | | | | | | | | | | | Merge branch 'ew/fd-cloexec-fix' into maintJunio C Hamano2017-07-211-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | set FD_CLOEXEC properly when O_CLOEXEC is not supportedew/fd-cloexec-fixEric Wong2017-07-171-3/+3
* | | | | | | | | | | | | Merge branch 'ks/fix-rebase-doc-picture' into maintJunio C Hamano2017-07-211-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | doc: correct a mistake in an illustrationks/fix-rebase-doc-pictureKaartic Sivaraam2017-07-101-1/+1
| | |_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | |