summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'ta/config-add-to-empty-or-true-fix'Junio C Hamano2014-09-194-7/+41
|\
| * config: avoid a funny sentinel value "a^"ta/config-add-to-empty-or-true-fixJeff King2014-09-113-7/+21
| * make config --add behave correctly for empty and NULL valuesTanay Abhra2014-08-183-2/+22
* | Merge branch 'sp/doc-update-index-cacheinfo'Junio C Hamano2014-09-191-1/+1
|\ \
| * | Documentation: use single-parameter --cacheinfo in examplesp/doc-update-index-cacheinfoSteffen Prohaska2014-09-111-1/+1
* | | Merge branch 'rs/export-strbuf-addchars'Junio C Hamano2014-09-197-20/+18
|\ \ \
| * | | strbuf: use strbuf_addchars() for adding a char multiple timesrs/export-strbuf-addcharsRené Scharfe2014-09-083-13/+6
| * | | strbuf: export strbuf_addchars()René Scharfe2014-09-084-7/+12
* | | | Merge branch 'kb/perf-trace'Junio C Hamano2014-09-191-1/+1
|\ \ \ \
| * | | | trace: correct trace_strbuf() parameter type for !HAVE_VARIADIC_MACROSkb/perf-traceRené Scharfe2014-09-081-1/+1
* | | | | Merge branch 'jc/parseopt-verify-short-name'Junio C Hamano2014-09-192-3/+15
|\ \ \ \ \
| * | | | | parse-options: detect attempt to add a duplicate short option namejc/parseopt-verify-short-nameJunio C Hamano2014-09-042-3/+15
| | |_|_|/ | |/| | |
* | | | | Merge branch 'mk/reachable-protect-detached-head'Junio C Hamano2014-09-192-0/+25
|\ \ \ \ \
| * | | | | reachable.c: add HEAD to reachability starting commitsmk/reachable-protect-detached-headMax Kirillov2014-09-032-0/+25
* | | | | | Merge branch 'tb/complete-diff-ignore-blank-lines'Junio C Hamano2014-09-191-2/+2
|\ \ \ \ \ \
| * | | | | | completion: Add --ignore-blank-lines for difftb/complete-diff-ignore-blank-linesThomas Braun2014-09-031-2/+2
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'as/calloc-takes-nmemb-then-size'Junio C Hamano2014-09-192-2/+2
|\ \ \ \ \ \
| * | | | | | calloc() and xcalloc() takes nmemb and then sizeas/calloc-takes-nmemb-then-sizeArjun Sreedharan2014-09-032-2/+2
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'tb/crlf-tests'Junio C Hamano2014-09-195-120/+178
|\ \ \ \ \ \
| * | | | | | MinGW: update tests to handle a native eol of crlftb/crlf-testsBrice Lambson2014-09-022-20/+35
| * | | | | | Makefile: propagate NATIVE_CRLF to CPat Thoyts2014-09-022-0/+23
| * | | | | | t0027: Tests for core.eol=native, eol=lf, eol=crlfTorsten Bögershausen2014-08-281-100/+120
* | | | | | | Merge branch 'rs/simplify-http-walker'Junio C Hamano2014-09-191-9/+6
|\ \ \ \ \ \ \
| * | | | | | | http-walker: simplify process_alternates_response() using strbufrs/simplify-http-walkerRené Scharfe2014-09-021-9/+6
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch 'rs/simplify-config-include'Junio C Hamano2014-09-191-5/+1
|\ \ \ \ \ \ \
| * | | | | | | config: simplify git_config_include()rs/simplify-config-includeRené Scharfe2014-09-021-5/+1
| |/ / / / / /
* | | | | | | Merge branch 'rs/merge-tree-simplify'Junio C Hamano2014-09-191-12/+6
|\ \ \ \ \ \ \
| * | | | | | | merge-tree: remove unused df_conflict argumentsrs/merge-tree-simplifyRené Scharfe2014-09-021-12/+6
| |/ / / / / /
* | | | | | | Merge branch 'da/styles'Junio C Hamano2014-09-197-9/+10
|\ \ \ \ \ \ \
| * | | | | | | stylefix: asterisks stick to the variable, not the typeda/stylesDavid Aguilar2014-09-027-9/+10
| |/ / / / / /
* | | | | | | Merge branch 'ah/grammofix'Junio C Hamano2014-09-198-10/+10
|\ \ \ \ \ \ \
| * | | | | | | grammofix in user-facing messagesah/grammofixAlex Henrie2014-09-028-10/+10
| |/ / / / / /
* | | | | | | Merge branch 'rs/more-uses-of-skip-prefix'Junio C Hamano2014-09-192-16/+11
|\ \ \ \ \ \ \
| * | | | | | | pack-write: simplify index_pack_lockfile using skip_prefix() and xstrfmt()rs/further-uses-of-skip-prefixrs/furhter-uses-of-skip-prefixRené Scharfe2014-09-021-6/+5
| * | | | | | | connect: simplify check_ref() using skip_prefix() and starts_with()René Scharfe2014-09-021-10/+6
| |/ / / / / /
* | | | | | | Merge branch 'mb/fast-import-delete-root'Junio C Hamano2014-09-192-1/+109
|\ \ \ \ \ \ \
| * | | | | | | fast-import: fix segfault in store_tree()mb/fast-import-delete-rootMaxim Bublis2014-08-292-3/+7
| * | | | | | | t9300: test filedelete commandMaxim Bublis2014-08-291-0/+104
* | | | | | | | Merge branch 'jp/index-with-corrupt-stages'Junio C Hamano2014-09-191-1/+18
|\ \ \ \ \ \ \ \
| * | | | | | | | read_index_unmerged(): remove unnecessary loop index adjustmentjp/index-with-corrupt-stagesJaime Soriano Pastor2014-08-291-1/+0
| * | | | | | | | read_index_from(): catch out of order entries when reading an index fileJaime Soriano Pastor2014-08-291-0/+18
| | |_|_|/ / / / | |/| | | | | |
* | | | | | | | Merge branch 'jk/index-pack-threading-races'Junio C Hamano2014-09-191-2/+31
|\ \ \ \ \ \ \ \
| * | | | | | | | index-pack: fix race condition with duplicate basesjk/index-pack-threading-racesJeff King2014-08-291-2/+31
| | |_|_|_|_|/ / | |/| | | | | |
* | | | | | | | Merge branch 'jk/commit-author-parsing'Junio C Hamano2014-09-199-120/+130
|\ \ \ \ \ \ \ \
| * | | | | | | | determine_author_info(): copy getenv outputjk/commit-author-parsingJeff King2014-08-291-13/+27
| * | | | | | | | determine_author_info(): reuse parsing functionsJeff King2014-08-291-28/+21
| * | | | | | | | date: use strbufs in date-formatting functionsJeff King2014-08-276-48/+45
| * | | | | | | | record_author_date(): use find_commit_header()Jeff King2014-08-271-14/+8
| * | | | | | | | record_author_date(): fix memory leak on malformed commitJeff King2014-08-271-1/+1
| * | | | | | | | commit: provide a function to find a header in a bufferJeff King2014-08-273-27/+39