summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* config doc: clarify "git config --path" examplenp/config-path-docNathan Payre2017-10-191-4/+4
* Prepare for 2.14.3Junio C Hamano2017-10-182-1/+76
* Merge branch 'jk/ref-filter-colors-fix' into maintJunio C Hamano2017-10-1823-71/+103
|\
| * tag: respect color.ui configjk/ref-filter-colors-fixJeff King2017-10-173-1/+12
| * Revert "color: check color.ui in git_default_config()"Jeff King2017-10-178-9/+17
| * Revert "t6006: drop "always" color config tests"Jeff King2017-10-171-5/+15
| * Revert "color: make "always" the same as "auto" in config"Jeff King2017-10-173-19/+20
| * Merge branch 'jk/ui-color-always-to-auto-maint' (early part) into jk/ref-filt...Junio C Hamano2017-10-1718-98/+100
| |\
| | * color: make "always" the same as "auto" in configJeff King2017-10-043-19/+28
| | * provide --color option for all ref-filter usersJeff King2017-10-046-4/+16
| | * t3205: use --color instead of color.branch=alwaysJeff King2017-10-041-3/+2
| | * t3203: drop "always" color testJeff King2017-10-041-6/+0
| | * t6006: drop "always" color config testsJeff King2017-10-041-15/+5
| | * t7502: use diff.noprefix for --verbose testJeff King2017-10-041-2/+2
| | * t7508: use test_terminal for color outputJeff King2017-10-041-20/+21
| | * t3701: use test-terminal to collect color outputJeff King2017-10-041-5/+3
| | * t4015: prefer --color to -c color.diff=alwaysJeff King2017-10-041-14/+14
| | * test-terminal: set TERM=vt100Jeff King2017-10-047-10/+9
* | | Merge branch 'jc/doc-checkout' into maintJunio C Hamano2017-10-181-14/+16
|\ \ \
| * | | checkout doc: clarify command line args for "checkout paths" modejc/doc-checkoutJunio C Hamano2017-10-111-14/+16
| |/ /
* | | Merge branch 'tb/complete-describe' into maintJunio C Hamano2017-10-181-1/+1
|\ \ \
| * | | completion: add --broken and --dirty to describetb/complete-describeThomas Braun2017-10-071-1/+1
| |/ /
* | | Merge branch 'rs/rs-mailmap' into maintJunio C Hamano2017-10-181-0/+1
|\ \ \
| * | | .mailmap: normalize name for René Scharfers/rs-mailmapRené Scharfe2017-10-061-0/+1
| |/ /
* | | Merge branch 'rs/fsck-null-return-from-lookup' into maintJunio C Hamano2017-10-182-4/+26
|\ \ \
| * | | fsck: handle NULL return of lookup_blob() and lookup_tree()rs/fsck-null-return-from-lookupRené Scharfe2017-10-062-4/+26
| |/ /
* | | Merge branch 'jk/sha1-loose-object-info-fix' into maintJunio C Hamano2017-10-181-2/+6
|\ \ \
| * | | sha1_loose_object_info: handle errors from unpack_sha1_restjk/sha1-loose-object-info-fixJeff King2017-10-061-2/+6
| |/ /
* | | Merge branch 'sb/branch-avoid-repeated-strbuf-release' into maintJunio C Hamano2017-10-181-2/+3
|\ \ \
| * | | branch: reset instead of release a strbufsb/branch-avoid-repeated-strbuf-releaseStefan Beller2017-10-041-2/+3
| |/ /
* | | Merge branch 'rs/qsort-s' into maintJunio C Hamano2017-10-181-1/+1
|\ \ \
| * | | test-stringlist: avoid buffer underrun when sorting nothingrs/qsort-sRené Scharfe2017-10-041-1/+1
* | | | Merge branch 'jn/strbuf-doc-re-reuse' into maintJunio C Hamano2017-10-181-2/+9
|\ \ \ \
| * | | | strbuf doc: reuse after strbuf_release is finejn/strbuf-doc-re-reuseJonathan Nieder2017-10-041-2/+9
| | |/ / | |/| |
* | | | Merge branch 'rs/run-command-use-alloc-array' into maintJunio C Hamano2017-10-181-1/+1
|\ \ \ \
| * | | | run-command: use ALLOC_ARRAYrs/run-command-use-alloc-arrayRené Scharfe2017-10-031-1/+1
| |/ / /
* | | | Merge branch 'rs/tag-null-pointer-arith-fix' into maintJunio C Hamano2017-10-181-4/+4
|\ \ \ \
| * | | | tag: avoid NULL pointer arithmeticrs/tag-null-pointer-arith-fixRené Scharfe2017-10-021-4/+4
| |/ / /
* | | | Merge branch 'rs/cocci-de-paren-call-params' into maintJunio C Hamano2017-10-181-5/+5
|\ \ \ \
| * | | | coccinelle: remove parentheses that become unnecessaryrs/cocci-de-paren-call-paramsRené Scharfe2017-10-021-5/+5
| |/ / /
* | | | Merge branch 'ad/doc-markup-fix' into maintJunio C Hamano2017-10-181-1/+1
|\ \ \ \
| * | | | doc: correct command formattingad/doc-markup-fixAdam Dinwoodie2017-09-291-1/+1
| |/ / /
* | | | Merge branch 'mr/doc-negative-pathspec' into maintJunio C Hamano2017-10-185-2/+24
|\ \ \ \
| * | | | docs: improve discoverability of exclude pathspecmr/doc-negative-pathspecManav Rathi2017-09-255-2/+24
* | | | | Merge branch 'jk/validate-headref-fix' into maintJunio C Hamano2017-10-181-11/+12
|\ \ \ \ \
| * | | | | validate_headref: use get_oid_hex for detached HEADsjk/validate-headref-fixJeff King2017-09-271-2/+2
| * | | | | validate_headref: use skip_prefix for symref parsingJeff King2017-09-271-9/+6
| * | | | | validate_headref: NUL-terminate HEAD bufferJeff King2017-09-271-0/+4
| | |/ / / | |/| | |
* | | | | Merge branch 'ks/doc-use-camelcase-for-config-name' into maintJunio C Hamano2017-10-182-3/+3
|\ \ \ \ \
| * | | | | doc: camelCase the config variables to improve readabilityks/doc-use-camelcase-for-config-nameKaartic Sivaraam2017-09-252-3/+3
View Lorry Controller Status