Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Revert "config.mak.uname: use clang for Mac OS X 10.6"tb/avoid-gcc-on-darwin-10-6 | Eric Sunshine | 2016-03-21 | 1 | -3/+0 |
* | config.mak.uname: use clang for Mac OS X 10.6 | Torsten Bögershausen | 2016-02-28 | 1 | -0/+3 |
* | Git 2.8-rc0v2.8.0-rc0 | Junio C Hamano | 2016-02-26 | 2 | -1/+96 |
* | Merge branch 'mm/readme-markdown' | Junio C Hamano | 2016-02-26 | 2 | -26/+32 |
|\ | |||||
| * | README.md: move down historical explanation about the name | Matthieu Moy | 2016-02-25 | 1 | -11/+13 |
| * | README.md: don't call git stupid in the title | Matthieu Moy | 2016-02-25 | 1 | -2/+2 |
| * | README.md: move the link to git-scm.com up | Matthieu Moy | 2016-02-25 | 1 | -3/+3 |
| * | README.md: add hyperlinks on filenames | Matthieu Moy | 2016-02-25 | 1 | -6/+13 |
| * | README: use markdown syntax | Matthieu Moy | 2016-02-25 | 2 | -6/+3 |
* | | Merge branch 'ma/update-hooks-sample-typofix' | Junio C Hamano | 2016-02-26 | 1 | -1/+1 |
|\ \ | |||||
| * | | templates/hooks: fix minor typo in the sample update-hookma/update-hooks-sample-typofix | Martin Amdisen | 2016-02-25 | 1 | -1/+1 |
* | | | Merge branch 'ls/makefile-cflags-developer-tweak' | Junio C Hamano | 2016-02-26 | 3 | -1/+18 |
|\ \ \ | |||||
| * | | | add DEVELOPER makefile knob to check for acknowledged warningsls/makefile-cflags-developer-tweak | Lars Schneider | 2016-02-25 | 3 | -1/+18 |
* | | | | Merge branch 'dt/initial-ref-xn-commit-doc' | Junio C Hamano | 2016-02-26 | 1 | -0/+12 |
|\ \ \ \ | |||||
| * | | | | refs: document transaction semanticsdt/initial-ref-xn-commit-doc | David Turner | 2016-02-25 | 1 | -0/+12 |
* | | | | | Merge branch 'js/config-set-in-non-repository' | Junio C Hamano | 2016-02-26 | 2 | -0/+14 |
|\ \ \ \ \ | |||||
| * | | | | | git config: report when trying to modify a non-existing repo configjs/config-set-in-non-repository | Johannes Schindelin | 2016-02-25 | 2 | -0/+14 |
* | | | | | | Merge branch 'jk/epipe-in-async' | Junio C Hamano | 2016-02-26 | 6 | -3/+25 |
|\ \ \ \ \ \ | |||||
| * | | | | | | t5504: handle expected output from SIGPIPE deathjk/epipe-in-async | Jeff King | 2016-02-25 | 1 | -1/+4 |
| * | | | | | | test_must_fail: report number of unexpected signal | Jeff King | 2016-02-25 | 1 | -1/+1 |
| * | | | | | | fetch-pack: ignore SIGPIPE in sideband demuxer | Jeff King | 2016-02-25 | 1 | -1/+5 |
| * | | | | | | write_or_die: handle EPIPE in async threads | Jeff King | 2016-02-25 | 3 | -0/+15 |
| |/ / / / / | |||||
* | | | | | | Merge branch 'mm/push-default-warning' | Junio C Hamano | 2016-02-26 | 1 | -34/+0 |
|\ \ \ \ \ \ | |||||
| * | | | | | | push: remove "push.default is unset" warning messagemm/push-default-warning | Matthieu Moy | 2016-02-25 | 1 | -34/+0 |
| | |_|_|_|/ | |/| | | | | |||||
* | | | | | | Merge branch 'fa/merge-recursive-no-rename' | Junio C Hamano | 2016-02-26 | 5 | -4/+337 |
|\ \ \ \ \ \ | |||||
| * | | | | | | t3034: test deprecated interfacefa/merge-recursive-no-rename | Felipe Gonçalves Assis | 2016-02-24 | 1 | -0/+46 |
| * | | | | | | t3034: test option to disable renames | Felipe Gonçalves Assis | 2016-02-24 | 1 | -0/+28 |
| * | | | | | | t3034: add rename threshold tests | Felipe Gonçalves Assis | 2016-02-24 | 2 | -1/+239 |
| * | | | | | | merge-recursive: find-renames resets threshold | Felipe Gonçalves Assis | 2016-02-24 | 1 | -1/+3 |
| * | | | | | | merge-strategies.txt: fix typo | Felipe Gonçalves Assis | 2016-02-22 | 1 | -2/+2 |
| * | | | | | | merge-recursive: more consistent interface | Felipe Gonçalves Assis | 2016-02-17 | 2 | -5/+10 |
| * | | | | | | merge-recursive: option to disable renames | Felipe Gonçalves Assis | 2016-02-17 | 3 | -0/+14 |
| | |_|/ / / | |/| | | | | |||||
* | | | | | | Merge branch 'sb/submodule-fetch-nontip' | Junio C Hamano | 2016-02-26 | 1 | -3/+26 |
|\ \ \ \ \ \ | |||||
| * | | | | | | submodule: try harder to fetch needed sha1 by direct fetching sha1sb/submodule-fetch-nontip | Stefan Beller | 2016-02-24 | 1 | -3/+26 |
| | |_|/ / / | |/| | | | | |||||
* | | | | | | Merge branch 'sb/submodule-module-list-fix' | Junio C Hamano | 2016-02-26 | 2 | -8/+27 |
|\ \ \ \ \ \ | |||||
| * | | | | | | submodule helper list: respect correct path prefixsb/submodule-module-list-fix | Stefan Beller | 2016-02-24 | 2 | -8/+27 |
| | |/ / / / | |/| | | | | |||||
* | | | | | | Merge branch 'tb/conversion' | Junio C Hamano | 2016-02-26 | 2 | -232/+272 |
|\ \ \ \ \ \ | |||||
| * | | | | | | convert.c: correct attr_action()tb/conversion | Torsten Bögershausen | 2016-02-23 | 2 | -16/+35 |
| * | | | | | | convert.c: simplify text_stat | Torsten Bögershausen | 2016-02-10 | 1 | -25/+22 |
| * | | | | | | convert.c: refactor crlf_action | Torsten Bögershausen | 2016-02-10 | 1 | -31/+46 |
| * | | | | | | convert.c: use text_eol_is_crlf() | Torsten Bögershausen | 2016-02-08 | 1 | -6/+14 |
| * | | | | | | convert.c: remove input_crlf_action() | Torsten Bögershausen | 2016-02-08 | 1 | -23/+14 |
| * | | | | | | convert.c: remove unused parameter 'path' | Torsten Bögershausen | 2016-02-08 | 1 | -10/+9 |
| * | | | | | | t0027: add tests for get_stream_filter() | Torsten Bögershausen | 2016-02-08 | 1 | -135/+146 |
* | | | | | | | Merge branch 'jk/grep-binary-workaround-in-test' | Junio C Hamano | 2016-02-26 | 2 | -13/+17 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | t9200: avoid grep on non-ASCII datajk/grep-binary-workaround-in-test | John Keeping | 2016-02-23 | 1 | -1/+1 |
| * | | | | | | | t8005: avoid grep on non-ASCII data | John Keeping | 2016-02-23 | 1 | -12/+16 |
| | |_|_|_|_|/ | |/| | | | | | |||||
* | | | | | | | Merge branch 'ps/plug-xdl-merge-leak' | Junio C Hamano | 2016-02-26 | 1 | -2/+7 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | xdiff/xmerge: fix memory leak in xdl_mergeps/plug-xdl-merge-leak | Patrick Steinhardt | 2016-02-23 | 1 | -2/+7 |
* | | | | | | | | Merge branch 'mm/push-simple-doc' | Junio C Hamano | 2016-02-26 | 1 | -0/+7 |
|\ \ \ \ \ \ \ \ |