summaryrefslogtreecommitdiff
path: root/diff.h
Commit message (Expand)AuthorAgeFilesLines
* 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
|\ \
| * | diff.c: --ws-error-highlight=<kind> optionJunio C Hamano2015-05-261-0/+5
| |/
* | diff: convert struct combine_diff_path to object_idbrian m. carlson2015-03-131-2/+3
|/
* Merge branch 'ks/tree-diff-nway'Junio C Hamano2014-06-031-2/+9
|\
| * tree-diff: rework diff_tree() to generate diffs for multiparent cases as wellKirill Smelkov2014-04-071-0/+9
| * tree-diff: diff_tree() should now be staticKirill Smelkov2014-03-261-2/+0
* | Merge branch 'jc/hold-diff-remove-q-synonym-for-no-deletion'Junio C Hamano2014-03-071-2/+0
|\ \ | |/ |/|
| * diff: remove "diff-files -q" in a version of Git in a distant futurejc/hold-diff-remove-q-synonym-for-no-deletionJunio C Hamano2013-07-191-2/+0
* | combine-diff: combine_diff_path.len is not needed anymoreKirill Smelkov2014-02-241-1/+0
* | Merge branch 'tg/diff-no-index-refactor'Junio C Hamano2013-12-271-1/+1
|\ \
| * | diff: move no-index detection to builtin/diff.cThomas Gummerer2013-12-121-1/+1
View Lorry Controller Status