aboutsummaryrefslogtreecommitdiff
path: root/diff.h
Commit message (Expand)AuthorAge
* Merge branch 'nd/ita-empty-commit'Junio C Hamano2016-10-27
|\
| * commit: fix empty commit creation when there's no changes but ita entriesNguyễn Thái Ngọc Duy2016-10-24
| * diff-lib: allow ita entries treated as "not yet exist in index"Nguyễn Thái Ngọc Duy2016-10-24
* | diff_aligned_abbrev: use "struct oid"Jeff King2016-10-26
* | diff_unique_abbrev: rename to diff_aligned_abbrevJeff King2016-10-26
|/
* Merge branch 'mh/diff-indent-heuristic'Junio C Hamano2016-09-26
|\
| * blame: honor the diff heuristic options and configMichael Haggerty2016-09-19
* | Merge branch 'jk/diff-submodule-diff-inline'Junio C Hamano2016-09-12
|\ \
| * | diff: teach diff to display submodule difference with an inline diffJacob Keller2016-08-31
| * | diff: prepare for additional submodule formatsJacob Keller2016-08-31
| * | graph: add support for --line-prefix on all graph-aware outputJacob Keller2016-08-31
| * | diff.c: remove output_prefix_length fieldJunio C Hamano2016-08-31
| |/
* | patch-ids: add flag to create the diff patch id using header only dataKevin Willford2016-07-29
|/
* Merge branch 'mm/diff-renames-default'Junio C Hamano2016-04-03
|\
| * diff: activate diff.renames by defaultMatthieu Moy2016-02-25
* | Merge branch 'jk/tighten-alloc'Junio C Hamano2016-02-26
|\ \
| * | tree-diff: catch integer overflow in combine_diff_path allocationJeff King2016-02-19
| * | Merge branch 'nd/diff-with-path-params' into maintJunio C Hamano2016-02-05
| |\ \
* | \ \ Merge branch 'jk/more-comments-on-textconv'Junio C Hamano2016-02-26
|\ \ \ \ | |_|_|/ |/| | |
| * | | diff: clarify textconv interfaceJeff King2016-02-22
* | | | Merge branch 'nd/diff-with-path-params'Junio C Hamano2016-02-03
|\ \ \ \ | |_|/ / |/| | / | | |/ | |/|
| * | diff: make -O and --output work in subdirectoryDuy Nguyen2016-01-21
| * | diff-no-index: do not take a redundant prefix argumentNguyễn Thái Ngọc Duy2016-01-21
* | | avoid shifting signed integers 31 bitsJeff King2016-01-04
|/ /
* | log: add "log.follow" configuration variableDavid Turner2015-07-09
* | Merge branch 'jk/color-diff-plain-is-context'Junio C Hamano2015-06-11
|\ \ | |/
| * diff.h: rename DIFF_PLAIN color slot to DIFF_CONTEXTJeff King2015-05-27
* | Merge branch 'jc/diff-ws-error-highlight'Junio C Hamano2015-06-11
|\ \
| * | diff.c: --ws-error-highlight=<kind> optionJunio C Hamano2015-05-26
| |/
* | diff: convert struct combine_diff_path to object_idbrian m. carlson2015-03-13
|/
* Merge branch 'ks/tree-diff-nway'Junio C Hamano2014-06-03
|\
| * tree-diff: rework diff_tree() to generate diffs for multiparent cases as wellKirill Smelkov2014-04-07
| * tree-diff: diff_tree() should now be staticKirill Smelkov2014-03-26
* | Merge branch 'jc/hold-diff-remove-q-synonym-for-no-deletion'Junio C Hamano2014-03-07
|\ \ | |/ |/|
| * diff: remove "diff-files -q" in a version of Git in a distant futureJunio C Hamano2013-07-19
* | combine-diff: combine_diff_path.len is not needed anymoreKirill Smelkov2014-02-24
* | Merge branch 'tg/diff-no-index-refactor'Junio C Hamano2013-12-27
|\ \
| * | diff: move no-index detection to builtin/diff.cThomas Gummerer2013-12-12
* | | Merge branch 'zk/difftool-counts'Junio C Hamano2013-12-27
|\ \ \
| * | | difftool: display the number of files in the diff queue in the promptZoltan Klinger2013-12-06
| |/ /
* | | Use the word 'stuck' instead of 'sticked'Nicolas Vigier2013-10-31
|/ /
* | Merge branch 'mg/more-textconv'Junio C Hamano2013-10-23
|\ \
| * | diff_opt: track whether flags have been set explicitlyJunio C Hamano2013-05-10
* | | Merge branch 'jl/submodule-mv'Junio C Hamano2013-09-09
|\ \ \ | |_|/ |/| |
| * | remove diff_tree_{setup,release}_pathsNguyễn Thái Ngọc Duy2013-07-15
| * | move struct pathspec and related functions to pathspec.[ch]Nguyễn Thái Ngọc Duy2013-07-15
| |/
* | diff: deprecate -q option to diff-filesJunio C Hamano2013-07-19
* | diff: preparse --diff-filter string argumentJunio C Hamano2013-07-17
|/
* Merge branch 'mp/diff-algo-config'Junio C Hamano2013-02-17
|\
| * diff: Introduce --diff-algorithm command line optionMichal Privoznik2013-01-16