summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* 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
|/
* Git 2.7.5v2.7.5Junio C Hamano2017-05-054-3/+19
* Merge branch 'maint-2.6' into maint-2.7Junio C Hamano2017-05-055-4/+43
|\
| * Git 2.6.7v2.6.7maint-2.6Junio C Hamano2017-05-054-3/+16
| * Merge branch 'maint-2.5' into maint-2.6Junio C Hamano2017-05-054-3/+29
| |\
| | * Git 2.5.6v2.5.6maint-2.5Junio C Hamano2017-05-054-3/+16
| | * Merge branch 'maint-2.4' into maint-2.5Junio C Hamano2017-05-053-2/+15
| | |\
| | | * Git 2.4.12v2.4.12maint-2.4Junio C Hamano2017-05-054-3/+16
| | | * Merge branch 'jk/shell-no-repository-that-begins-with-dash' into maint-2.4Junio C Hamano2017-05-051-1/+1
| | | |\
| | | | * shell: disallow repo names beginning with dashjk/shell-no-repository-that-begins-with-dashJeff King2017-05-051-1/+1
| | | |/
* | | | Merge branch 'jk/war-on-sprintf' into maint-2.7Junio C Hamano2016-05-261-1/+1
|\ \ \ \
| * | | | archive-tar: convert snprintf to xsnprintfjk/war-on-sprintfJeff King2016-05-261-1/+1
* | | | | Merge branch 'mm/doc-hooks-linkgit-fix' into maintJunio C Hamano2016-03-211-1/+1
|\ \ \ \ \
| * | | | | Documentation: fix broken linkgit to git-configmm/doc-hooks-linkgit-fixMatthieu Moy2016-03-211-1/+1
| | |_|_|/ | |/| | |
* | | | | Merge branch 'es/st-add4-gcc-4.2-workaround' into maintJunio C Hamano2016-03-211-2/+2
|\ \ \ \ \
| * | | | | git-compat-util: st_add4: work around gcc 4.2.x compiler crashes/st-add4-gcc-4.2-workaroundEric Sunshine2016-03-211-2/+2
* | | | | | Git 2.7.4v2.7.4Junio C Hamano2016-03-173-2/+13
* | | | | | Sync with Git 2.6.6Junio C Hamano2016-03-174-3/+39
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | 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
| | | |\ \ \
* | | | \ \ \ Merge branch 'jk/path-name-safety-2.7' into maintJunio C Hamano2016-03-1610-142/+46
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'jk/path-name-safety-2.6' into jk/path-name-safety-2.7jk/path-name-safety-2.7Junio C Hamano2016-03-1610-142/+46
| |\ \ \ \ \ \ \ |/ / / / / / / /
| * | | | | | | Merge branch 'jk/path-name-safety-2.5' into jk/path-name-safety-2.6jk/path-name-safety-2.6Junio C Hamano2016-03-1613-146/+84
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| | * | | | | | Merge branch 'jk/path-name-safety-2.4' into jk/path-name-safety-2.5jk/path-name-safety-2.5Junio C Hamano2016-03-1613-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.7.3v2.7.3Junio C Hamano2016-03-104-3/+66
* | | | | Merge branch 'ma/update-hooks-sample-typofix' into maintJunio C Hamano2016-03-101-1/+1
|\ \ \ \ \
| * | | | | templates/hooks: fix minor typo in the sample update-hookma/update-hooks-sample-typofixMartin Amdisen2016-02-251-1/+1
| | |_|/ / | |/| | |
* | | | | Merge branch 'dt/initial-ref-xn-commit-doc' into maintJunio C Hamano2016-03-101-0/+12
|\ \ \ \ \
| * | | | | refs: document transaction semanticsdt/initial-ref-xn-commit-docDavid Turner2016-02-251-0/+12
* | | | | | Merge branch 'ps/plug-xdl-merge-leak' into maintJunio C Hamano2016-03-101-2/+7
|\ \ \ \ \ \
| * | | | | | xdiff/xmerge: fix memory leak in xdl_mergeps/plug-xdl-merge-leakPatrick Steinhardt2016-02-231-2/+7
| | |_|/ / / | |/| | | |
* | | | | | Merge branch 'ak/git-strip-extension-from-dashed-command' into maintJunio C Hamano2016-03-102-15/+15
|\ \ \ \ \ \
| * | | | | | git.c: simplify stripping extension of a file in handle_builtin()ak/git-strip-extension-from-dashed-commandAlexander Kuleshov2016-02-212-15/+15