summaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jk/options-cleanup'Junio C Hamano2016-02-107-102/+57
|\
| * apply, ls-files: simplify "-z" parsingjk/options-cleanupJeff King2016-02-012-24/+6
| * checkout-index: disallow "--no-stage" optionJeff King2016-02-011-3/+3
| * checkout-index: handle "--no-index" optionJeff King2016-02-011-24/+10
| * checkout-index: handle "--no-prefix" optionJeff King2016-02-011-12/+6
| * checkout-index: simplify "-z" option parsingJeff King2016-02-011-10/+2
| * give "nbuf" strbuf a more meaningful nameJeff King2016-02-015-29/+30
* | Merge branch 'cc/untracked'Junio C Hamano2016-02-101-23/+39
|\ \
| * | config: add core.untrackedCacheChristian Couder2016-01-271-11/+24
| * | dir: add remove_untracked_cache()Christian Couder2016-01-251-5/+1
| * | dir: add {new,add}_untracked_cache()Christian Couder2016-01-251-10/+1
| * | update-index: move 'uc' var declarationChristian Couder2016-01-251-3/+1
| * | update-index: add untracked cache notificationsChristian Couder2016-01-251-5/+9
| * | update-index: add --test-untracked-cacheChristian Couder2016-01-251-0/+5
| * | update-index: use enum for untracked cache optionsChristian Couder2016-01-251-5/+13
| * | dir: free untracked cache when removing itChristian Couder2015-12-291-0/+1
* | | Merge branch 'jk/ref-cache-non-repository-optim'Junio C Hamano2016-02-031-25/+1
|\ \ \
| * | | clean: make is_git_repository a public functionJeff King2016-01-251-25/+1
* | | | Merge branch 'nd/diff-with-path-params'Junio C Hamano2016-02-032-2/+2
|\ \ \ \
| * | | | diff: make -O and --output work in subdirectorynd/diff-with-path-paramsDuy Nguyen2016-01-211-1/+1
| * | | | diff-no-index: do not take a redundant prefix argumentNguyễn Thái Ngọc Duy2016-01-211-1/+1
* | | | | Merge branch 'tg/ls-remote-symref'Junio C Hamano2016-02-031-54/+36
|\ \ \ \ \
| * | | | | ls-remote: add support for showing symrefstg/ls-remote-symrefThomas Gummerer2016-01-191-2/+8
| * | | | | ls-remote: use parse-options apiThomas Gummerer2016-01-191-53/+29
| * | | | | ls-remote: document --refs optionThomas Gummerer2016-01-191-1/+1
| | |/ / / | |/| | |
* | | | | 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