summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jk/ui-color-always-to-auto-maint' into jk/ui-color-always-to-autojk/ui-color-always-to-autoJunio C Hamano2017-10-0419-99/+101
|\
| * 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
* | t7301: use test_terminal to check colorJeff King2017-10-041-2/+3
* | t4015: use --color with --color-movedJeff King2017-10-041-13/+12
* | The twelfth batch for 2.15Junio C Hamano2017-10-031-0/+24
* | Merge branch 'bw/git-clang-format'Junio C Hamano2017-10-031-6/+6
|\ \
| * | clang-format: adjust line break penaltiesbw/git-clang-formatJohannes Schindelin2017-10-011-6/+6
* | | Merge branch 'ad/doc-markup-fix'Junio C Hamano2017-10-031-1/+1
|\ \ \
| * | | doc: correct command formattingad/doc-markup-fixAdam Dinwoodie2017-09-291-1/+1
* | | | Merge branch 'mh/mmap-packed-refs'Junio C Hamano2017-10-039-369/+848
|\ \ \ \
| * | | | packed-backend.c: rename a bunch of things and update commentsmh/mmap-packed-refsMichael Haggerty2017-09-251-190/+232
| * | | | mmapped_ref_iterator: inline into `packed_ref_iterator`Michael Haggerty2017-09-251-170/+114
| * | | | ref_cache: remove support for storing peeled valuesMichael Haggerty2017-09-253-72/+11
| * | | | packed_ref_store: get rid of the `ref_cache` entirelyMichael Haggerty2017-09-251-27/+2
| * | | | ref_store: implement `refs_peel_ref()` genericallyMichael Haggerty2017-09-254-78/+17
| * | | | packed_read_raw_ref(): read the reference from the mmapped bufferMichael Haggerty2017-09-251-5/+9
| * | | | packed_ref_iterator_begin(): iterate using `mmapped_ref_iterator`Michael Haggerty2017-09-251-3/+106
| * | | | read_packed_refs(): ensure that references are ordered when readMichael Haggerty2017-09-251-11/+212
| * | | | packed_ref_cache: keep the `packed-refs` file mmapped if possibleMichael Haggerty2017-09-253-42/+152
| * | | | packed-backend.c: reorder some definitionsMichael Haggerty2017-09-251-24/+24
| * | | | mmapped_ref_iterator_advance(): no peeled value for broken refsMichael Haggerty2017-09-251-2/+8
| * | | | mmapped_ref_iterator: add iterator over a packed-refs fileMichael Haggerty2017-09-251-55/+152
| * | | | packed_ref_cache: remember the file-wide peeling stateMichael Haggerty2017-09-251-5/+12
| * | | | read_packed_refs(): read references with minimal copyingMichael Haggerty2017-09-251-61/+40
| * | | | read_packed_refs(): make parsing of the header line more robustMichael Haggerty2017-09-141-6/+15
| * | | | read_packed_refs(): only check for a header at the top of the fileMichael Haggerty2017-09-141-11/+24
| * | | | read_packed_refs(): use mmap to read the `packed-refs` fileMichael Haggerty2017-09-141-10/+32
| * | | | die_unterminated_line(), die_invalid_line(): new functionsMichael Haggerty2017-09-141-3/+25
| * | | | packed_ref_cache: add a backlink to the associated `packed_ref_store`Michael Haggerty2017-09-141-7/+16
| * | | | prefix_ref_iterator: break when we leave the prefixJeff King2017-09-141-1/+31
| * | | | ref_iterator: keep track of whether the iterator output is orderedMichael Haggerty2017-09-147-19/+46
* | | | | Merge branch 'mr/doc-negative-pathspec'Junio C Hamano2017-10-035-2/+24
|\ \ \ \ \
| * | | | | docs: improve discoverability of exclude pathspecmr/doc-negative-pathspecManav Rathi2017-09-255-2/+24
* | | | | | Merge branch 'sb/submodule-diff-header-fix'Junio C Hamano2017-10-032-2/+2
|\ \ \ \ \ \
| * | | | | | submodule: correct error message for missing commitssb/submodule-diff-header-fixStefan Beller2017-09-282-2/+2
* | | | | | | Merge branch 'sb/diff-color-move'Junio C Hamano2017-10-037-0/+35
|\ \ \ \ \ \ \
| * | | | | | | diff: correct newline in summary for renamed filesStefan Beller2017-09-287-0/+35
* | | | | | | | Merge branch 'sb/test-submodule-update-config'Junio C Hamano2017-10-031-0/+8
|\ \ \ \ \ \ \ \
| * | | | | | | | t7406: submodule.<name>.update command must not be run from .gitmodulessb/test-submodule-update-configStefan Beller2017-09-271-0/+8
* | | | | | | | | Merge branch 'jk/validate-headref-fix'Junio C Hamano2017-10-031-11/+12
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | validate_headref: use get_oid_hex for detached HEADsjk/validate-headref-fixJeff King2017-09-271-2/+2
View Lorry Controller Status