summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* 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
| |/
* | Git 2.8.5v2.8.5Junio C Hamano2017-05-054-3/+16
* | Merge branch 'maint-2.7' into maint-2.8Junio C Hamano2017-05-056-5/+60
|\ \ | |/
| * 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
| | | | |/
* | | | | Git 2.8.4v2.8.4Junio C Hamano2016-06-064-3/+18
* | | | | Merge branch 'kb/msys2-tty' into maintJunio C Hamano2016-06-062-5/+56
|\ \ \ \ \
| * | | | | mingw: make isatty() recognize MSYS2's pseudo terminals (/dev/pty*)kb/msys2-ttyKarsten Blees2016-05-262-5/+56
* | | | | | Merge branch 'da/difftool' into maintJunio C Hamano2016-06-062-2/+30
|\ \ \ \ \ \
| * | | | | | difftool: handle unmerged files in dir-diff modeda/difftoolDavid Aguilar2016-05-162-0/+28
| * | | | | | difftool: initialize variables for readabilityDavid Aguilar2016-05-161-2/+2
* | | | | | | Merge branch 'tb/core-eol-fix' into maintJunio C Hamano2016-06-064-189/+141
|\ \ \ \ \ \ \
| * | | | | | | convert.c: ident + core.autocrlf didn't worktb/core-eol-fixTorsten Bögershausen2016-04-252-13/+8
| * | | | | | | t0027: test cases for combined attributesTorsten Bögershausen2016-04-251-169/+129
| * | | | | | | convert: allow core.autocrlf=input and core.eol=crlfTorsten Bögershausen2016-04-252-7/+3
| * | | | | | | t0027: make commit_chk_wrnNNO() reliableTorsten Bögershausen2016-04-251-1/+2
* | | | | | | | Merge branch 'ar/diff-args-osx-precompose' into maintJunio C Hamano2016-06-065-0/+47
|\ \ \ \ \ \ \ \
| * | | | | | | | diff: run arguments through precompose_argvar/diff-args-osx-precomposeAlexander Rinass2016-05-135-0/+47
| | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | More topics for 2.8.4Junio C Hamano2016-05-311-0/+28
* | | | | | | | Merge branch 'sb/submodule-deinit-all' into maintJunio C Hamano2016-05-313-10/+48
|\ \ \ \ \ \ \ \
| * | | | | | | | submodule deinit: require '--all' instead of '.' for all submodulesStefan Beller2016-05-053-10/+48
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge branch 'bn/http-cookiefile-config' into maintJunio C Hamano2016-05-312-3/+4
|\ \ \ \ \ \ \ \
| * | | | | | | | http: expand http.cookieFile as a pathbn/http-cookiefile-configBrian Norris2016-05-042-2/+3
| * | | | | | | | Documentation: config: improve word ordering for http.cookieFileBrian Norris2016-05-041-1/+1
| | |_|_|_|_|/ / | |/| | | | | |
* | | | | | | | Merge branch 'jk/test-send-sh-x-trace-elsewhere' into maintJunio C Hamano2016-05-312-3/+16
|\ \ \ \ \ \ \ \
| * | | | | | | | test-lib: set BASH_XTRACEFD automaticallyjk/test-send-sh-x-trace-elsewhereJeff King2016-05-112-3/+16
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Merge branch 'js/name-rev-use-oldest-ref' into maintJunio C Hamano2016-05-312-7/+14
|\ \ \ \ \ \ \ \
| * | | | | | | | name-rev: include taggerdate in considering the best namejs/name-rev-use-oldest-refJohannes Schindelin2016-04-222-7/+14
| |/ / / / / / /
* | | | | | | | Start preparing for 2.8.4Junio C Hamano2016-05-261-0/+27
* | | | | | | | Merge branch 'jc/linkgit-fix' into maintJunio C Hamano2016-05-268-10/+10
|\ \ \ \ \ \ \ \
| * | | | | | | | Documentation: fix linkgit referencesjc/linkgit-fixJunio C Hamano2016-05-098-10/+10
| | |_|_|/ / / / | |/| | | | | |
* | | | | | | | Merge branch 'ls/travis-build-doc' into maintJunio C Hamano2016-05-262-0/+29
|\ \ \ \ \ \ \ \
| * | | | | | | | travis-ci: build documentationls/travis-build-docLars Schneider2016-05-102-0/+29
| | |_|_|/ / / / | |/| | | | | |
* | | | | | | | Merge branch 'jc/fsck-nul-in-commit' into maintJunio C Hamano2016-05-262-3/+31
|\ \ \ \ \ \ \ \
| * | | | | | | | fsck: detect and warn a commit with embedded NULjc/fsck-nul-in-commitJunio C Hamano2016-05-102-0/+26