Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Git 2.8.6v2.8.6maint-2.8 | Junio C Hamano | 2017-07-30 | 3 | -2/+6 |
* | Merge tag 'v2.7.6' into maint-2.8 | Junio C Hamano | 2017-07-30 | 7 | -0/+100 |
|\ | |||||
| * | Git 2.7.6v2.7.6maint-2.7 | Junio C Hamano | 2017-07-30 | 3 | -2/+27 |
| * | Merge branch 'jk/ssh-funny-url' into maint-2.7 | Junio C Hamano | 2017-07-28 | 6 | -0/+75 |
| |\ | |||||
| | * | connect: reject paths that look like command line options | Jeff King | 2017-07-28 | 3 | -0/+40 |
| | * | connect: reject dashed arguments for proxy commands | Jeff King | 2017-07-28 | 2 | -0/+10 |
| | * | connect: factor out "looks like command line option" check | Jeff King | 2017-07-28 | 3 | -1/+14 |
| | * | t5813: add test for hostname starting with dash | Jeff King | 2017-07-28 | 1 | -0/+9 |
| | * | connect: reject ssh hostname that begins with a dash | Junio C Hamano | 2017-07-28 | 1 | -0/+3 |
| |/ | |||||
* | | Git 2.8.5v2.8.5 | Junio C Hamano | 2017-05-05 | 4 | -3/+16 |
* | | Merge branch 'maint-2.7' into maint-2.8 | Junio C Hamano | 2017-05-05 | 6 | -5/+60 |
|\ \ | |/ | |||||
| * | Git 2.7.5v2.7.5 | Junio C Hamano | 2017-05-05 | 4 | -3/+19 |
| * | Merge branch 'maint-2.6' into maint-2.7 | Junio C Hamano | 2017-05-05 | 5 | -4/+43 |
| |\ | |||||
| | * | Git 2.6.7v2.6.7maint-2.6 | Junio C Hamano | 2017-05-05 | 4 | -3/+16 |
| | * | Merge branch 'maint-2.5' into maint-2.6 | Junio C Hamano | 2017-05-05 | 4 | -3/+29 |
| | |\ | |||||
| | | * | Git 2.5.6v2.5.6maint-2.5 | Junio C Hamano | 2017-05-05 | 4 | -3/+16 |
| | | * | Merge branch 'maint-2.4' into maint-2.5 | Junio C Hamano | 2017-05-05 | 3 | -2/+15 |
| | | |\ | |||||
| | | | * | Git 2.4.12v2.4.12maint-2.4 | Junio C Hamano | 2017-05-05 | 4 | -3/+16 |
| | | | * | Merge branch 'jk/shell-no-repository-that-begins-with-dash' into maint-2.4 | Junio C Hamano | 2017-05-05 | 1 | -1/+1 |
| | | | |\ | |||||
| | | | | * | shell: disallow repo names beginning with dashjk/shell-no-repository-that-begins-with-dash | Jeff King | 2017-05-05 | 1 | -1/+1 |
| | | | |/ | |||||
* | | | | | Git 2.8.4v2.8.4 | Junio C Hamano | 2016-06-06 | 4 | -3/+18 |
* | | | | | Merge branch 'kb/msys2-tty' into maint | Junio C Hamano | 2016-06-06 | 2 | -5/+56 |
|\ \ \ \ \ | |||||
| * | | | | | mingw: make isatty() recognize MSYS2's pseudo terminals (/dev/pty*)kb/msys2-tty | Karsten Blees | 2016-05-26 | 2 | -5/+56 |
* | | | | | | Merge branch 'da/difftool' into maint | Junio C Hamano | 2016-06-06 | 2 | -2/+30 |
|\ \ \ \ \ \ | |||||
| * | | | | | | difftool: handle unmerged files in dir-diff modeda/difftool | David Aguilar | 2016-05-16 | 2 | -0/+28 |
| * | | | | | | difftool: initialize variables for readability | David Aguilar | 2016-05-16 | 1 | -2/+2 |
* | | | | | | | Merge branch 'tb/core-eol-fix' into maint | Junio C Hamano | 2016-06-06 | 4 | -189/+141 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | convert.c: ident + core.autocrlf didn't worktb/core-eol-fix | Torsten Bögershausen | 2016-04-25 | 2 | -13/+8 |
| * | | | | | | | t0027: test cases for combined attributes | Torsten Bögershausen | 2016-04-25 | 1 | -169/+129 |
| * | | | | | | | convert: allow core.autocrlf=input and core.eol=crlf | Torsten Bögershausen | 2016-04-25 | 2 | -7/+3 |
| * | | | | | | | t0027: make commit_chk_wrnNNO() reliable | Torsten Bögershausen | 2016-04-25 | 1 | -1/+2 |
* | | | | | | | | Merge branch 'ar/diff-args-osx-precompose' into maint | Junio C Hamano | 2016-06-06 | 5 | -0/+47 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | diff: run arguments through precompose_argvar/diff-args-osx-precompose | Alexander Rinass | 2016-05-13 | 5 | -0/+47 |
| | |_|_|_|_|_|/ | |/| | | | | | | |||||
* | | | | | | | | More topics for 2.8.4 | Junio C Hamano | 2016-05-31 | 1 | -0/+28 |
* | | | | | | | | Merge branch 'sb/submodule-deinit-all' into maint | Junio C Hamano | 2016-05-31 | 3 | -10/+48 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | submodule deinit: require '--all' instead of '.' for all submodules | Stefan Beller | 2016-05-05 | 3 | -10/+48 |
| | |/ / / / / / | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'bn/http-cookiefile-config' into maint | Junio C Hamano | 2016-05-31 | 2 | -3/+4 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | http: expand http.cookieFile as a pathbn/http-cookiefile-config | Brian Norris | 2016-05-04 | 2 | -2/+3 |
| * | | | | | | | | Documentation: config: improve word ordering for http.cookieFile | Brian Norris | 2016-05-04 | 1 | -1/+1 |
| | |_|_|_|_|/ / | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'jk/test-send-sh-x-trace-elsewhere' into maint | Junio C Hamano | 2016-05-31 | 2 | -3/+16 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | test-lib: set BASH_XTRACEFD automaticallyjk/test-send-sh-x-trace-elsewhere | Jeff King | 2016-05-11 | 2 | -3/+16 |
| | |_|/ / / / / | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'js/name-rev-use-oldest-ref' into maint | Junio C Hamano | 2016-05-31 | 2 | -7/+14 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | name-rev: include taggerdate in considering the best namejs/name-rev-use-oldest-ref | Johannes Schindelin | 2016-04-22 | 2 | -7/+14 |
| |/ / / / / / / | |||||
* | | | | | | | | Start preparing for 2.8.4 | Junio C Hamano | 2016-05-26 | 1 | -0/+27 |
* | | | | | | | | Merge branch 'jc/linkgit-fix' into maint | Junio C Hamano | 2016-05-26 | 8 | -10/+10 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Documentation: fix linkgit referencesjc/linkgit-fix | Junio C Hamano | 2016-05-09 | 8 | -10/+10 |
| | |_|_|/ / / / | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'ls/travis-build-doc' into maint | Junio C Hamano | 2016-05-26 | 2 | -0/+29 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | travis-ci: build documentationls/travis-build-doc | Lars Schneider | 2016-05-10 | 2 | -0/+29 |
| | |_|_|/ / / / | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'jc/fsck-nul-in-commit' into maint | Junio C Hamano | 2016-05-26 | 2 | -3/+31 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | fsck: detect and warn a commit with embedded NULjc/fsck-nul-in-commit | Junio C Hamano | 2016-05-10 | 2 | -0/+26 |