summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* setup_git_env(): introduce git_path_from_env() helperjk/xstrfmtJeff King2014-06-251-9/+9
* unique_path: fix unlikely heap overflowJeff King2014-06-191-15/+26
* walker_fetch: fix minor memory leakJeff King2014-06-191-9/+9
* merge: use argv_array when spawning merge strategyJeff King2014-06-191-29/+13
* sequencer: use argv_array_pushfJeff King2014-06-191-7/+2
* setup_git_env: use git_pathdup instead of xmalloc + sprintfJeff King2014-06-191-8/+4
* use xstrfmt to replace xmalloc + strcpy/strcatJeff King2014-06-195-23/+6
* use xstrfmt to replace xmalloc + sprintfJeff King2014-06-196-41/+18
* use xstrdup instead of xmalloc + strcpyJeff King2014-06-193-10/+4
* use xstrfmt in favor of manual size calculationsJeff King2014-06-192-16/+7
* strbuf: add xstrfmt helperJeff King2014-06-192-0/+28
* Third batch for 2.1Junio C Hamano2014-06-161-0/+80
* Merge branch 'ib/test-selectively-run'Junio C Hamano2014-06-163-12/+617
|\
| * t0000-*.sh: fix the GIT_SKIP_TESTS sub-testsib/test-selectively-runRamsay Jones2014-06-061-51/+57
| * test-lib: '--run' to run only specific testsIlya Bobyr2014-06-063-8/+537
| * test-lib: tests skipped by GIT_SKIP_TESTS say soIlya Bobyr2014-06-062-5/+71
| * test-lib: document short options in t/READMEIlya Bobyr2014-06-061-0/+4
* | Merge branch 'ta/string-list-init'Junio C Hamano2014-06-162-2/+4
|\ \
| * | string-list: spell all values out that are given to a string_list initializerTanay Abhra2014-06-062-2/+4
* | | Merge branch 'jm/dedup-test-config'Junio C Hamano2014-06-161-5/+0
|\ \ \
| * | | t/t7810-grep.sh: remove duplicate test_config()jm/dedup-test-configJeremiah Mahler2014-06-051-5/+0
* | | | Merge branch 'dt/refs-check-refname-component-optim'Junio C Hamano2014-06-162-29/+44
|\ \ \ \
| * | | | refs.c: optimize check_refname_component()dt/refs-check-refname-component-optimDavid Turner2014-06-052-29/+44
* | | | | Merge branch 'sk/test-cmp-bin'Junio C Hamano2014-06-165-22/+28
|\ \ \ \ \
| * | | | | t5000, t5003: do not use test_cmp to compare binary filessk/test-cmp-binStepan Kasal2014-06-045-22/+28
| | |_|/ / | |/| | |
* | | | | Merge branch 'sh/enable-preloadindex'Junio C Hamano2014-06-162-3/+3
|\ \ \ \ \
| * | | | | environment.c: enable core.preloadindex by defaultsh/enable-preloadindexSteve Hoelzer2014-06-032-3/+3
| |/ / / /
* | | | | Merge branch 'rs/read-ref-at'Junio C Hamano2014-06-162-107/+105
|\ \ \ \ \
| * | | | | refs.c: change read_ref_at to use the reflog iteratorsrs/read-ref-atRonnie Sahlberg2014-06-032-107/+105
| |/ / / /
* | | | | Merge branch 'jk/error-resolve-conflict-advice'Junio C Hamano2014-06-161-5/+4
|\ \ \ \ \
| * | | | | error_resolve_conflict: drop quotations around operationjk/error-resolve-conflict-adviceJeff King2014-06-031-1/+1
| * | | | | error_resolve_conflict: rewrap advice messageJeff King2014-06-031-4/+3
* | | | | | Merge branch 'rs/pack-objects-no-unnecessary-realloc'Junio C Hamano2014-06-161-2/+2
|\ \ \ \ \ \
| * | | | | | pack-objects: use free()+xcalloc() instead of xrealloc()+memset()rs/pack-objects-no-unnecessary-reallocRené Scharfe2014-06-021-2/+2
| | |_|_|/ / | |/| | | |
* | | | | | Merge branch 'lt/log-auto-decorate'Junio C Hamano2014-06-161-0/+2
|\ \ \ \ \ \
| * | | | | | git log: support "auto" decorationslt/log-auto-decorateLinus Torvalds2014-05-301-0/+2
| | |_|/ / / | |/| | | |
* | | | | | Merge branch 'jm/doc-wording-tweaks'Junio C Hamano2014-06-162-9/+8
|\ \ \ \ \ \
| * | | | | | Documentation: wording fixes in the user manual and glossaryjm/doc-wording-tweaksJeremiah Mahler2014-05-282-9/+8
* | | | | | | Merge branch 'jm/format-patch-mail-sig'Junio C Hamano2014-06-164-2/+93
|\ \ \ \ \ \ \
| * | | | | | | format-patch: add "--signature-file=<file>" optionjm/format-patch-mail-sigJeremiah Mahler2014-05-274-0/+86
| * | | | | | | format-patch: make newline after signature conditionalJeff King2014-05-211-2/+7
* | | | | | | | Merge branch 'jk/http-errors'Junio C Hamano2014-06-1612-13/+183
|\ \ \ \ \ \ \ \
| * | | | | | | | http: default text charset to iso-8859-1jk/http-errorsJeff King2014-05-271-0/+3
| * | | | | | | | remote-curl: reencode http error messagesJeff King2014-05-273-7/+19
| * | | | | | | | strbuf: add strbuf_reencode helperJeff King2014-05-273-0/+23
| * | | | | | | | http: optionally extract charset parameter from content-typeJeff King2014-05-272-4/+57
| * | | | | | | | http: extract type/subtype portion of content-typeJeff King2014-05-274-5/+48
| * | | | | | | | t5550: test display of remote http error messagesJeff King2014-05-234-0/+32
| * | | | | | | | t/lib-httpd: use write_script to copy CGI scriptsJeff King2014-05-232-2/+5
| * | | | | | | | test-lib: preserve GIT_CURL_VERBOSE from the environmentJeff King2014-05-231-0/+1
| | |/ / / / / / | |/| | | | | |