summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* diff: define block by number of alphanumeric charsjt/diff-color-move-fixJonathan Tan2017-08-164-81/+183
* diff: respect MIN_BLOCK_LENGTH for last blockJonathan Tan2017-08-162-7/+59
* diff: avoid redundantly clearing a flagJonathan Tan2017-08-141-1/+1
* diff: document the new --color-moved settingStefan Beller2017-06-302-2/+49
* diff.c: add dimming to moved line detectionStefan Beller2017-06-304-13/+254
* diff.c: color moved lines differently, plain modeStefan Beller2017-06-303-3/+59
* diff.c: color moved lines differentlyStefan Beller2017-06-303-15/+602
* diff.c: buffer all output if asked toStefan Beller2017-06-302-2/+109
* diff.c: emit_diff_symbol learns about DIFF_SYMBOL_SUMMARYStefan Beller2017-06-301-30/+41
* diff.c: emit_diff_symbol learns about DIFF_SYMBOL_STAT_SEPStefan Beller2017-06-301-3/+7
* diff.c: convert word diffing to use emit_diff_symbolStefan Beller2017-06-301-33/+46
* diff.c: convert show_stats to use emit_diff_symbolStefan Beller2017-06-302-44/+74
* diff.c: convert emit_binary_diff_body to use emit_diff_symbolStefan Beller2017-06-301-17/+46
* submodule.c: migrate diff output to use emit_diff_symbolStefan Beller2017-06-304-68/+121
* diff.c: emit_diff_symbol learns DIFF_SYMBOL_REWRITE_DIFFStefan Beller2017-06-301-14/+21
* diff.c: emit_diff_symbol learns about DIFF_SYMBOL_BINARY_FILESStefan Beller2017-06-301-5/+15
* diff.c: emit_diff_symbol learns DIFF_SYMBOL_HEADERStefan Beller2017-06-301-8/+20
* diff.c: emit_diff_symbol learns DIFF_SYMBOL_FILEPAIR_{PLUS, MINUS}Stefan Beller2017-06-301-21/+30
* diff.c: emit_diff_symbol learns DIFF_SYMBOL_CONTEXT_INCOMPLETEStefan Beller2017-06-301-2/+4
* diff.c: emit_diff_symbol learns DIFF_SYMBOL_WORDS[_PORCELAIN]Stefan Beller2017-06-301-16/+26
* diff.c: migrate emit_line_checked to use emit_diff_symbolStefan Beller2017-06-303-44/+80
* diff.c: emit_diff_symbol learns DIFF_SYMBOL_NO_LF_EOFStefan Beller2017-06-301-8/+11
* diff.c: emit_diff_symbol learns DIFF_SYMBOL_CONTEXT_FRAGINFOStefan Beller2017-06-301-2/+6
* diff.c: emit_diff_symbol learns DIFF_SYMBOL_CONTEXT_MARKERStefan Beller2017-06-301-1/+9
* diff.c: introduce emit_diff_symbolStefan Beller2017-06-301-3/+19
* diff.c: factor out diff_flush_patch_all_file_pairsStefan Beller2017-06-301-5/+12
* diff.c: move line ending check into emit_hunk_headerStefan Beller2017-06-301-2/+2
* diff.c: readability fixStefan Beller2017-06-301-2/+2
* Merge branch 'sb/hashmap-customize-comparison' into sb/diff-color-moveJunio C Hamano2017-06-30441-8419/+13147
|\
| * hashmap: migrate documentation from Documentation/technical into headersb/hashmap-customize-comparisonStefan Beller2017-06-302-341/+316
| * patch-ids.c: use hashmap correctlyStefan Beller2017-06-301-4/+4
| * hashmap.h: compare function has access to a data fieldStefan Beller2017-06-3019-66/+113
| * Twelfth batch for 2.14Junio C Hamano2017-06-261-1/+11
| * Merge branch 'mb/reword-autocomplete-message'Junio C Hamano2017-06-261-6/+12
| |\
| | * auto-correct: tweak phrasingmb/reword-autocomplete-messageMarc Branchaud2017-06-211-6/+12
| * | Merge branch 'ks/t7508-indent-fix'Junio C Hamano2017-06-261-1/+1
| |\ \
| | * | t7508: fix a broken indentationks/t7508-indent-fixKaartic Sivaraam2017-06-211-1/+1
| | |/
| * | Merge branch 'jk/add-p-commentchar-fix'Junio C Hamano2017-06-262-1/+10
| |\ \
| | * | add--interactive: quote commentChar regexjk/add-p-commentchar-fixJeff King2017-06-212-1/+9
| | * | add--interactive: handle EOF in prompt_yesnoJeff King2017-06-211-0/+1
| * | | Merge branch 'dt/raise-core-packed-git-limit'Junio C Hamano2017-06-261-1/+2
| |\ \ \
| | * | | docs: update 64-bit core.packedGitLimit defaultdt/raise-core-packed-git-limitJeff King2017-06-211-1/+2
| * | | | Merge branch 'mh/packed-ref-store-prep'Junio C Hamano2017-06-265-11/+54
| |\ \ \ \
| | * | | | for_each_bisect_ref(): don't trim refnamesMichael Haggerty2017-06-184-2/+31
| | * | | | lock_packed_refs(): fix cache validity checkMichael Haggerty2017-06-121-9/+23
| * | | | | Merge branch 'lb/status-stash-count'Junio C Hamano2017-06-2612-38/+115
| |\ \ \ \ \
| | * | | | | glossary: define 'stash entry'lb/status-stash-countLiam Beguin2017-06-181-0/+4
| | * | | | | status: add optional stash count informationLiam Beguin2017-06-186-0/+71
| | * | | | | stash: update documentation to use 'stash entry'Liam Beguin2017-06-186-38/+40
| * | | | | | Sync with 2.13.2Junio C Hamano2017-06-242-12/+17
| |\ \ \ \ \ \