summaryrefslogtreecommitdiff
path: root/diff.h
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jk/revision-pruning-optim'Junio C Hamano2017-11-061-0/+1
|\
| * revision: quit pruning diff more quickly when possiblejk/revision-pruning-optimJeff King2017-10-141-0/+1
* | diff: define block by number of alphanumeric charsjt/diff-color-move-fixJonathan Tan2017-08-161-1/+1
* | diff.c: add dimming to moved line detectionStefan Beller2017-06-301-2/+7
* | diff.c: color moved lines differently, plain modeStefan Beller2017-06-301-0/+1
* | diff.c: color moved lines differentlyStefan Beller2017-06-301-1/+11
* | diff.c: buffer all output if asked toStefan Beller2017-06-301-0/+2
* | diff.c: convert show_stats to use emit_diff_symbolStefan Beller2017-06-301-2/+2
* | submodule.c: migrate diff output to use emit_diff_symbolStefan Beller2017-06-301-0/+9
* | diff.c: migrate emit_line_checked to use emit_diff_symbolStefan Beller2017-06-301-3/+3
* | Merge branch 'bw/object-id'Junio C Hamano2017-06-191-19/+19
|\ \
| * | tree-diff: convert diff_tree_paths to struct object_idBrandon Williams2017-06-051-2/+2
| * | diff-tree: convert diff_tree_sha1 to struct object_idBrandon Williams2017-06-051-2/+3
| * | tree-diff: convert diff_root_tree_sha1 to struct object_idBrandon Williams2017-06-021-2/+2
| * | combine-diff: convert diff_tree_combined to struct object_idBrandon Williams2017-06-021-1/+1
| * | diff: convert diff_flush_patch_id to struct object_idBrandon Williams2017-06-021-1/+1
| * | diff: convert diff_change to struct object_idBrandon Williams2017-06-021-7/+6
| * | diff: convert diff_addremove to struct object_idBrandon Williams2017-06-021-4/+4
* | | Merge branch 'js/blame-lib'Junio C Hamano2017-06-051-0/+7
|\ \ \ | |/ / |/| |
| * | blame: move textconv_object with related functionsJeff Smith2017-05-241-0/+7
* | | diff-lib: convert do_diff_cache to struct object_idbrian m. carlson2017-05-081-1/+1
|/ /
* | Rename sha1_array to oid_arraybrian m. carlson2017-03-311-2/+2
|/
* Merge branch 'nd/ita-empty-commit'Junio C Hamano2016-10-271-1/+2
|\
| * commit: fix empty commit creation when there's no changes but ita entriesNguyễn Thái Ngọc Duy2016-10-241-1/+1
| * diff-lib: allow ita entries treated as "not yet exist in index"Nguyễn Thái Ngọc Duy2016-10-241-0/+1
* | diff_aligned_abbrev: use "struct oid"Jeff King2016-10-261-1/+1
* | diff_unique_abbrev: rename to diff_aligned_abbrevJeff King2016-10-261-1/+5
|/
* Merge branch 'mh/diff-indent-heuristic'Junio C Hamano2016-09-261-0/+1
|\
| * blame: honor the diff heuristic options and configMichael Haggerty2016-09-191-0/+1
* | Merge branch 'jk/diff-submodule-diff-inline'Junio C Hamano2016-09-121-2/+9
|\ \
| * | diff: teach diff to display submodule difference with an inline diffJacob Keller2016-08-311-1/+2
| * | diff: prepare for additional submodule formatsJacob Keller2016-08-311-1/+6
| * | graph: add support for --line-prefix on all graph-aware outputJacob Keller2016-08-311-0/+2
| * | diff.c: remove output_prefix_length fieldJunio C Hamano2016-08-311-1/+0
| |/
* | patch-ids: add flag to create the diff patch id using header only dataKevin Willford2016-07-291-1/+1
|/
* Merge branch 'mm/diff-renames-default'Junio C Hamano2016-04-031-0/+1
|\
| * diff: activate diff.renames by defaultmm/diff-renames-defaultMatthieu Moy2016-02-251-0/+1
* | Merge branch 'jk/tighten-alloc'Junio C Hamano2016-02-261-2/+2
|\ \
| * | tree-diff: catch integer overflow in combine_diff_path allocationJeff King2016-02-191-2/+2
| * | Merge branch 'nd/diff-with-path-params' into maintJunio C Hamano2016-02-051-2/+2
| |\ \
* | \ \ Merge branch 'jk/more-comments-on-textconv'Junio C Hamano2016-02-261-0/+16
|\ \ \ \ | |_|_|/ |/| | |
| * | | diff: clarify textconv interfacejk/more-comments-on-textconvJeff King2016-02-221-0/+16
* | | | Merge branch 'nd/diff-with-path-params'Junio C Hamano2016-02-031-2/+2
|\ \ \ \ | |_|/ / |/| | / | | |/ | |/|
| * | diff: make -O and --output work in subdirectorynd/diff-with-path-paramsDuy Nguyen2016-01-211-1/+1
| * | diff-no-index: do not take a redundant prefix argumentNguyễn Thái Ngọc Duy2016-01-211-1/+1
* | | avoid shifting signed integers 31 bitsJeff King2016-01-041-1/+1
|/ /
* | log: add "log.follow" configuration variableDavid Turner2015-07-091-0/+1
* | Merge branch 'jk/color-diff-plain-is-context'Junio C Hamano2015-06-111-1/+1
|\ \ | |/
| * diff.h: rename DIFF_PLAIN color slot to DIFF_CONTEXTjk/color-diff-plain-is-contextJeff King2015-05-271-1/+1
* | Merge branch 'jc/diff-ws-error-highlight'Junio C Hamano2015-06-111-0/+5
|\ \
View Lorry Controller Status