summaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'tb/ls-files-eol'Junio C Hamano2016-02-031-0/+21
|\
| * ls-files: add eol diagnosticstb/ls-files-eolTorsten Bögershausen2016-01-181-0/+21
* | Merge branch 'jk/notes-merge-from-anywhere'Junio C Hamano2016-02-031-1/+1
|\ \
| * | notes: allow merging from arbitrary referencesjk/notes-merge-from-anywhereJacob Keller2016-01-171-1/+1
* | | Merge branch 'jc/peace-with-crlf'Junio C Hamano2016-02-037-8/+8
|\ \ \
| * | | 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
| * | | clone/sha1_file: read info/alternates 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
| * | | hash-object: read --stdin-paths with strbuf_getline()Junio C Hamano2016-01-151-1/+1
* | | | Merge branch 'jk/list-tag-2.7-regression'Junio C Hamano2016-02-011-2/+2
|\ \ \ \
| * | | | tag: do not show ambiguous tag names as "tags/foo"jk/list-tag-2.7-regressionJeff King2016-01-261-2/+2
| | |/ / | |/| |
* | | | Merge branch 'jk/shortlog'Junio C Hamano2016-01-281-87/+99
|\ \ \ \
| * | | | shortlog: don't warn on empty authorjk/shortlogJeff King2016-01-191-8/+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-191-3/+4
| |/ / /
* | | | Merge branch 'jc/strbuf-getline'Junio C Hamano2016-01-2820-74/+68
|\ \ \ \ | | |/ / | |/| |
| * | | strbuf: give strbuf_getline() to the "most text friendly" variantjc/strbuf-getlineJunio C Hamano2016-01-151-4/+4
| * | | 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-1515-24/+24
| * | | strbuf: make strbuf_getline_crlf() globalJunio C Hamano2016-01-141-15/+0
| |/ /
* | | Merge branch 'tk/interpret-trailers-in-place'Junio C Hamano2016-01-281-4/+9
|\ \ \
| * | | interpret-trailers: add option for in-place editingtk/interpret-trailers-in-placeTobias Klauser2016-01-141-4/+9
| |/ /
* | | Merge branch 'jk/symbolic-ref'Junio C Hamano2016-01-262-5/+9
|\ \ \
| * | | checkout,clone: check return value of create_symrefJeff King2016-01-122-5/+9
| |/ /
* | | Merge branch 'ak/format-patch-odir-config'Junio C Hamano2016-01-261-0/+6
|\ \ \
| * | | format-patch: introduce format.outputDirectory configurationak/format-patch-odir-configAlexander Kuleshov2016-01-131-0/+6
| |/ /
* | | Merge branch 'js/close-packs-before-gc'Junio C Hamano2016-01-264-0/+5
|\ \ \
| * | | receive-pack: release pack files before garbage-collectingJohannes Schindelin2016-01-131-0/+1
| * | | merge: release pack files before garbage-collectingJohannes Schindelin2016-01-131-0/+1
| * | | am: release pack files before garbage-collectingJohannes Schindelin2016-01-131-0/+1
| * | | fetch: release pack files before garbage-collectingJohannes Schindelin2016-01-131-0/+2
| |/ /
* | | Merge branch 'js/pull-rebase-i'Junio C Hamano2016-01-262-5/+14
|\ \ \
| * | | remote: handle the config setting branch.*.rebase=interactiveJohannes Schindelin2016-01-131-3/+7
| * | | pull: allow interactive rebase with --rebase=interactiveJohannes Schindelin2016-01-131-2/+7
| |/ /
* | | Merge branch 'tg/grep-no-index-fallback'Junio C Hamano2016-01-201-3/+9
|\ \ \
| * | | builtin/grep: add grep.fallbackToNoIndex configtg/grep-no-index-fallbackThomas Gummerer2016-01-121-3/+9
* | | | Merge branch 'js/fopen-harder'Junio C Hamano2016-01-203-3/+3
|\ \ \ \
| * | | | Handle more file writes correctly in shared reposjs/fopen-harderJohannes Schindelin2016-01-112-2/+2
| * | | | commit: allow editing the commit message even in shared reposJohannes Schindelin2016-01-071-1/+1
View Lorry Controller Status