summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | Merge branch 'jk/notes-merge-from-anywhere'Junio C Hamano2016-02-034-12/+29
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | notes: allow merging from arbitrary referencesjk/notes-merge-from-anywhereJacob Keller2016-01-174-12/+29
* | | | | | | | | | Merge branch 'jc/peace-with-crlf'Junio C Hamano2016-02-0313-20/+15
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | test-sha1-array: read command stream with strbuf_getline()jc/peace-with-crlfJunio C Hamano2016-01-151-1/+1
| * | | | | | | | | | grep: read -f file with strbuf_getline()Junio C Hamano2016-01-151-1/+1
| * | | | | | | | | | send-pack: read list of refs with strbuf_getline()Junio C Hamano2016-01-151-1/+1
| * | | | | | | | | | column: read lines with strbuf_getline()Junio C Hamano2016-01-151-1/+1
| * | | | | | | | | | cat-file: read batch stream with strbuf_getline()Junio C Hamano2016-01-151-1/+1
| * | | | | | | | | | transport-helper: read helper response with strbuf_getline()Junio C Hamano2016-01-151-1/+1
| * | | | | | | | | | clone/sha1_file: read info/alternates with strbuf_getline()Junio C Hamano2016-01-152-2/+2
| * | | | | | | | | | remote.c: read $GIT_DIR/remotes/* with strbuf_getline()Junio C Hamano2016-01-151-1/+1
| * | | | | | | | | | ident.c: read /etc/mailname with strbuf_getline()Junio C Hamano2016-01-151-1/+1
| * | | | | | | | | | rev-parse: read parseopt spec with strbuf_getline()Junio C Hamano2016-01-151-2/+2
| * | | | | | | | | | revision: read --stdin with strbuf_getline()Junio C Hamano2016-01-151-7/+2
| * | | | | | | | | | hash-object: read --stdin-paths with strbuf_getline()Junio C Hamano2016-01-151-1/+1
* | | | | | | | | | | Getting closer to 2.7.1testingJunio C Hamano2016-02-011-0/+9
* | | | | | | | | | | Merge branch 'jk/list-tag-2.7-regression'Junio C Hamano2016-02-017-56/+72
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | tag: do not show ambiguous tag names as "tags/foo"jk/list-tag-2.7-regressionJeff King2016-01-267-4/+62
| * | | | | | | | | | | t6300: use test_atom for some un-modern testsJeff King2016-01-251-52/+10
| | |_|_|/ / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'ew/svn-1.9.0-auth'Junio C Hamano2016-02-011-2/+6
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | git-svn: fix auth parameter handling on SVN 1.9.0+ew/svn-1.9.0-authEric Wong2016-01-261-2/+6
| | |_|_|_|_|_|_|/ / / | |/| | | | | | | | |
* | | | | | | | | | | Fourth batch for 2.8.cycleJunio C Hamano2016-01-281-1/+24
* | | | | | | | | | | Merge branch 'jk/shortlog'Junio C Hamano2016-01-282-103/+105
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | shortlog: don't warn on empty authorjk/shortlogJeff King2016-01-192-24/+0
| * | | | | | | | | | | shortlog: optimize out useless string listJeff King2016-01-191-12/+31
| * | | | | | | | | | | shortlog: optimize out useless "<none>" normalizationJeff King2016-01-191-29/+34
| * | | | | | | | | | | shortlog: optimize "--summary" modeJeff King2016-01-191-4/+6
| * | | | | | | | | | | shortlog: replace hand-parsing of author with pretty-printerJeff King2016-01-191-36/+26
| * | | | | | | | | | | shortlog: use strbufs to read from stdinJeff King2016-01-191-9/+12
| * | | | | | | | | | | shortlog: match both "Author:" and "author" on stdinJeff King2016-01-192-3/+10
| | |/ / / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'jc/strbuf-getline'Junio C Hamano2016-01-2841-116/+150
|\ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / | |/| | | | | | | | |
| * | | | | | | | | | strbuf: give strbuf_getline() to the "most text friendly" variantjc/strbuf-getlineJunio C Hamano2016-01-154-21/+20
| * | | | | | | | | | checkout-index: there are only two possible line terminationsJunio C Hamano2016-01-151-8/+8
| * | | | | | | | | | update-index: there are only two possible line terminationsJunio C Hamano2016-01-151-11/+16
| * | | | | | | | | | check-ignore: there are only two possible line terminationsJunio C Hamano2016-01-151-3/+4
| * | | | | | | | | | check-attr: there are only two possible line terminationsJunio C Hamano2016-01-151-3/+4
| * | | | | | | | | | mktree: there are only two possible line terminationsJunio C Hamano2016-01-151-6/+8
| * | | | | | | | | | strbuf: introduce strbuf_getline_{lf,nul}()Junio C Hamano2016-01-1536-59/+81
| * | | | | | | | | | strbuf: make strbuf_getline_crlf() globalJunio C Hamano2016-01-143-15/+19
| * | | | | | | | | | strbuf: miniscule style fixJunio C Hamano2016-01-141-2/+2
| |/ / / / / / / / /
* | | | | | | | | | Merge branch 'js/msys2'Junio C Hamano2016-01-287-12/+77
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | mingw: uglify (a, 0) definitions to shut up warningsjs/msys2Johannes Schindelin2016-01-152-2/+6
| * | | | | | | | | | mingw: squash another warning about a castJohannes Schindelin2016-01-151-1/+1
| * | | | | | | | | | mingw: avoid warnings when casting HANDLEs to intJohannes Schindelin2016-01-153-5/+9
| * | | | | | | | | | mingw: avoid redefining S_* constantsJohannes Schindelin2016-01-151-0/+4
| * | | | | | | | | | compat/winansi: support compiling with MSys2Johannes Schindelin2016-01-141-0/+2
| * | | | | | | | | | compat/mingw: support MSys2-based MinGW buildJohannes Schindelin2016-01-141-1/+23
| * | | | | | | | | | nedmalloc: allow compiling with MSys2's compilerJohannes Schindelin2016-01-141-0/+4
| * | | | | | | | | | config.mak.uname: supporting 64-bit MSys2Johannes Schindelin2016-01-131-3/+11
| * | | | | | | | | | config.mak.uname: support MSys2Johannes Schindelin2016-01-131-2/+19
| |/ / / / / / / / /