summaryrefslogtreecommitdiff
path: root/diff.c
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jt/packmigrate'Junio C Hamano2017-08-261-0/+1
|\
| * pack: move has_sha1_pack()Jonathan Tan2017-08-231-0/+1
* | Merge branch 'bw/submodule-config-cleanup'Junio C Hamano2017-08-261-3/+0
|\ \
| * | diff: stop allowing diff to have submodules configured in .git/configBrandon Williams2017-08-031-3/+0
* | | Merge branch 'po/object-id'Junio C Hamano2017-08-261-1/+1
|\ \ \
| * | | sha1_file: convert index_path to struct object_idPatryk Obara2017-08-201-1/+1
* | | | Merge branch 'jt/diff-color-move-fix'Junio C Hamano2017-08-261-8/+39
|\ \ \ \
| * | | | diff: define block by number of alphanumeric charsjt/diff-color-move-fixJonathan Tan2017-08-161-6/+22
| * | | | diff: respect MIN_BLOCK_LENGTH for last blockJonathan Tan2017-08-161-7/+22
| * | | | diff: avoid redundantly clearing a flagJonathan Tan2017-08-141-1/+1
* | | | | Merge branch 'sb/diff-color-move'Junio C Hamano2017-08-261-252/+1057
|\ \ \ \ \ | |/ / / / | | | | / | |_|_|/ |/| | |
| * | | diff.c: add dimming to moved line detectionStefan Beller2017-06-301-11/+121
| * | | diff.c: color moved lines differently, plain modeStefan Beller2017-06-301-2/+8
| * | | diff.c: color moved lines differentlyStefan Beller2017-06-301-14/+330
| * | | diff.c: buffer all output if asked toStefan Beller2017-06-301-2/+107
| * | | 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-301-42/+72
| * | | 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-301-12/+71
| * | | 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-301-41/+75
| * | | 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
* | | | diff: retire sane_truncate_fnjc/diff-sane-truncate-no-moreJunio C Hamano2017-08-171-5/+0
| |/ / |/| |
* | | color: check color.ui in git_default_config()Jeff King2017-07-131-3/+0
| |/ |/|
* | Merge branch 'rs/use-div-round-up'Junio C Hamano2017-07-121-1/+1
|\ \ | |/ |/|
| * use DIV_ROUND_UPrs/use-div-round-upRené Scharfe2017-07-101-1/+1
* | Merge branch 'ab/free-and-null'Junio C Hamano2017-06-241-4/+2
|\ \
| * | coccinelle: make use of the "type" FREE_AND_NULL() ruleÆvar Arnfjörð Bjarmason2017-06-161-4/+2
* | | Merge branch 'bw/config-h'Junio C Hamano2017-06-241-0/+1
|\ \ \
| * | | config: don't include config.h by defaultBrandon Williams2017-06-151-0/+1
| | |/ | |/|
* | | Merge branch 'bw/ls-files-sans-the-index'Junio C Hamano2017-06-241-3/+3
|\ \ \
| * | | convert: convert convert_to_git to take an indexBrandon Williams2017-06-131-3/+3
* | | | Merge branch 'bw/object-id'Junio C Hamano2017-06-191-38/+38
|\ \ \ \ | |_|_|/ |/| | |
| * | | diff: rename diff_fill_sha1_info to diff_fill_oid_infoBrandon Williams2017-06-051-9/+9
| * | | diff: convert diff_flush_patch_id to struct object_idBrandon Williams2017-06-021-6/+6
| * | | diff: finish conversion for prepare_temp_file to struct object_idBrandon Williams2017-06-021-2/+2
| * | | diff: convert reuse_worktree_file to struct object_idBrandon Williams2017-06-021-5/+5
View Lorry Controller Status