aboutsummaryrefslogtreecommitdiff
path: root/diff.h
Commit message (Expand)AuthorAge
* 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
* | diff: add diff_line_prefix functionJohn Keeping2013-02-12
|/
* Move setup_diff_pager to libgit.aNguyễn Thái Ngọc Duy2012-10-29
* diff.c: mark a private file-scope symbol as staticJunio C Hamano2012-09-15
* Merge branch 'jk/maint-null-in-trees'Junio C Hamano2012-08-27
|\
| * diff: do not use null sha1 as a sentinel valueJeff King2012-07-29
* | Merge branch 'tr/void-diff-setup-done'Junio C Hamano2012-08-22
|\ \
| * | diff_setup_done(): return voidThomas Rast2012-08-03
| |/
* | Merge branch 'lp/diffstat-with-graph'Junio C Hamano2012-05-02
|\ \
| * | Add output_prefix_length to diff_optionsLucian Poston2012-04-16
* | | Merge branch 'jk/diff-no-rename-empty'Junio C Hamano2012-04-16
|\ \ \
| * | | teach diffcore-rename to optionally ignore empty contentJeff King2012-03-23
| |/ /
* | | Merge branch 'jc/diff-algo-cleanup'Junio C Hamano2012-04-15
|\ \ \ | |/ / |/| |
| * | xdiff: PATIENCE/HISTOGRAM are not independent option bitsJunio C Hamano2012-02-19
* | | Merge branch 'jc/pickaxe-ignore-case'Junio C Hamano2012-03-07
|\ \ \
| * | | pickaxe: allow -i to search in patch case-insensitivelyJunio C Hamano2012-02-28
| |/ /
* | | Merge branch 'zj/diff-stat-dyncol'Junio C Hamano2012-03-06
|\ \ \ | |_|/ |/| |
| * | diff --stat: enable limiting of the graph partZbigniew Jędrzejewski-Szmek2012-03-01
* | | Use correct grammar in diffstat summary lineNguyễn Thái Ngọc Duy2012-02-03
|/ /
* | pass struct commit to diff_tree_combined_merge()René Scharfe2011-12-17
* | use struct sha1_array in diff_tree_combined()René Scharfe2011-12-17
|/
* diff: add option to show whole functions as contextRené Scharfe2011-10-10
* Merge branch 'jk/color-and-pager'Junio C Hamano2011-08-28
|\
| * diff: refactor COLOR_DIFF from a flag into an intJeff King2011-08-18
* | Merge branch 'mg/diff-stat-count'Junio C Hamano2011-06-29
|\ \ | |/ |/|
| * diff: introduce --stat-lines to limit the stat linesMichael J Gruber2011-05-27
* | Merge branch 'jk/diff-not-so-quick'Junio C Hamano2011-06-06
|\ \
| * | diff: futureproof "stop feeding the backend early" logicJunio C Hamano2011-05-31
* | | Merge branch 'jh/dirstat-lines'Junio C Hamano2011-05-13
|\ \ \
| * | | New --dirstat=lines mode, doing dirstat analysis based on diffstatJohan Herland2011-04-29
| * | | Allow specifying --dirstat cut-off percentage as a floating point numberJohan Herland2011-04-29
| | |/ | |/|
* | | Merge branch 'jc/fix-diff-files-unmerged'Junio C Hamano2011-05-06
|\ \ \ | |/ / |/| |
| * | diff: remove often unused parameters from diff_unmerge()Junio C Hamano2011-04-23
| * | diff.c: return filepair from diff_unmerge()Junio C Hamano2011-04-23