summaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jk/xstrfmt'Junio C Hamano2014-07-096-29/+11
|\
| * use xstrfmt to replace xmalloc + strcpy/strcatJeff King2014-06-193-14/+4
| * use xstrfmt to replace xmalloc + sprintfJeff King2014-06-192-11/+6
| * use xstrdup instead of xmalloc + strcpyJeff King2014-06-191-4/+1
* | Merge branch 'jk/skip-prefix'Junio C Hamano2014-07-099-32/+32
|\ \
| * | use skip_prefix to avoid repeating stringsJeff King2014-06-203-11/+11
| * | apply: use skip_prefix instead of raw additionJeff King2014-06-201-2/+3
| * | refactor skip_prefix to return a booleanJeff King2014-06-206-18/+17
| * | avoid using skip_prefix as a booleanJeff King2014-06-181-1/+1
| |/
* | diff-tree: call free_commit_list() instead of duplicating its codeRené Scharfe2014-07-081-6/+2
* | Merge branch 'jk/commit-buffer-length'Junio C Hamano2014-07-0211-29/+47
|\ \
| * | commit: record buffer length in cacheJeff King2014-06-136-6/+18
| * | use get_commit_buffer everywhereJeff King2014-06-133-4/+13
| * | convert logmsg_reencode to get_commit_bufferJeff King2014-06-132-3/+3
| * | use get_cached_commit_buffer where appropriateJeff King2014-06-131-1/+1
| * | provide a helper to set the commit bufferJeff King2014-06-131-1/+1
| * | provide a helper to free commit bufferJeff King2014-06-134-9/+6
| * | logmsg_reencode: return const bufferJeff King2014-06-122-2/+2
| * | do not create "struct commit" with xcallocJeff King2014-06-121-1/+1
| * | commit_tree: take a pointer/len pair rather than a const strbufJeff King2014-06-123-8/+8
* | | enums: remove trailing ',' after last item in enumRonnie Sahlberg2014-07-021-1/+1
* | | Merge branch 'maint'Junio C Hamano2014-07-021-1/+1
|\ \ \
| * \ \ Merge branch 'maint-1.8.5' into maintJunio C Hamano2014-07-021-1/+1
| |\ \ \
| | * | | enums: remove trailing ',' after last item in enumRonnie Sahlberg2014-07-021-1/+1
| * | | | Merge branch 'jl/status-added-submodule-is-never-ignored' into maintJunio C Hamano2014-06-251-2/+16
| |\ \ \ \
| * \ \ \ \ Merge branch 'ym/fix-opportunistic-index-update-race' into maintJunio C Hamano2014-06-251-1/+1
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'jl/remote-rm-prune' into maintJunio C Hamano2014-06-251-7/+30
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'fc/rerere-conflict-style' into maintJunio C Hamano2014-06-251-0/+2
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'dt/merge-recursive-case-insensitive' into maintJunio C Hamano2014-06-251-1/+2
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'rs/mailinfo-header-cmp' into maintJunio C Hamano2014-06-251-3/+3
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'jk/index-pack-report-missing' into maintJunio C Hamano2014-06-251-2/+7
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'nd/index-pack-one-fd-per-thread' into maintJunio C Hamano2014-06-251-10/+17
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'sk/spawn-less-case-insensitively-from-grep-O-i' into maintJunio C Hamano2014-06-251-0/+3
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'nd/daemonize-gc' into maintJunio C Hamano2014-06-251-6/+20
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/diff-follow-must-take-one-pathspec' into maintJunio C Hamano2014-06-251-6/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/commit-C-pick-empty' into maintJunio C Hamano2014-06-251-3/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'bc/blame-crlf-test' into maintJunio C Hamano2014-06-251-1/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jx/blame-align-relative-time' into maintJunio C Hamano2014-06-251-8/+22
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/apply-ignore-whitespace' into maintJunio C Hamano2014-06-251-5/+7
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/rev-parse-argh-dashed-multi-words' into maintJunio C Hamano2014-06-121-0/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | Merge branch 'rs/blame-refactor'Junio C Hamano2014-06-251-28/+14
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | blame: simplify prepare_lines()rs/blame-refactorRené Scharfe2014-06-131-13/+7
| * | | | | | | | | | | | | | | | | | | | blame: factor out get_next_line()René Scharfe2014-06-131-18/+10
| |/ / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | Merge branch 'jk/repack-pack-writebitmaps-config'Junio C Hamano2014-06-252-10/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | repack: introduce repack.writeBitmaps config optionJeff King2014-06-101-1/+2
| * | | | | | | | | | | | | | | | | | | | repack: simplify handling of --write-bitmap-indexJeff King2014-06-101-5/+4
| * | | | | | | | | | | | | | | | | | | | pack-objects: stop respecting pack.writebitmapsJeff King2014-06-101-4/+0
* | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/repack-pack-keep-objects'Junio C Hamano2014-06-251-5/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | repack: s/write_bitmap/&s/ in codejk/repack-pack-keep-objectsJeff King2014-06-101-6/+6
| * | | | | | | | | | | | | | | | | | | | repack: respect pack.writebitmapsJeff King2014-06-101-1/+5
View Lorry Controller Status