summaryrefslogtreecommitdiff
path: root/diff.c
AgeCommit message (Expand)AuthorFilesLines
2012-06-28diff-index.c: "git diff" has no need to read blob from the standard inputLibravatar Junio C Hamano1-20/+1
2012-06-15Merge branch 'as/diff-shortstat-ignore-binary'Libravatar Junio C Hamano1-1/+1
2012-06-15diff: Only count lines in show_shortstatsLibravatar Alexander Strasser1-1/+1
2012-05-07Merge branch 'zj/diff-empty-chmod'Libravatar Junio C Hamano1-16/+27
2012-05-02Merge branch 'zj/diff-stat-smaller-num-columns'Libravatar Junio C Hamano1-10/+38
2012-05-02Merge branch 'lp/diffstat-with-graph'Libravatar Junio C Hamano1-2/+6
2012-05-01diff --stat: do not run diff on indentical filesLibravatar Zbigniew Jędrzejewski-Szmek1-2/+5
2012-05-01diff --stat: report mode-only changes for binary files like text filesLibravatar Zbigniew Jędrzejewski-Szmek1-15/+23
2012-04-30diff --stat: use less columns for change countsLibravatar Zbigniew Jędrzejewski-Szmek1-10/+38
2012-04-23Merge branch 'lp/maint-diff-three-dash-with-graph'Libravatar Junio C Hamano1-0/+6
2012-04-18Prevent graph_width of stat width from falling below minLibravatar Lucian Poston1-1/+5
2012-04-16Merge branch 'jk/diff-no-rename-empty'Libravatar Junio C Hamano1-0/+5
2012-04-16Adjust stat width calculations to take --graph output into accountLibravatar Lucian Poston1-1/+1
2012-04-15Merge branch 'tr/maint-word-diff-regex-sticky'Libravatar Junio C Hamano1-56/+66
2012-04-15Merge branch 'jc/diff-algo-cleanup'Libravatar Junio C Hamano1-2/+2
2012-03-23teach diffcore-rename to optionally ignore empty contentLibravatar Jeff King1-0/+5
2012-03-20log --graph: fix break in graph linesLibravatar Lucian Poston1-0/+6
2012-03-14diff: tweak a _copy_ of diff_options with word-diffLibravatar Thomas Rast1-1/+4
2012-03-14diff: refactor the word-diff setup from builtin_diff_cmdLibravatar Thomas Rast1-56/+63
2012-03-12Merge branch 'jc/maint-diff-patch-header' into maintLibravatar Junio C Hamano1-1/+1
2012-03-06Merge branch 'jc/maint-diff-patch-header'Libravatar Junio C Hamano1-1/+1
2012-03-06Merge branch 'zj/diff-stat-dyncol'Libravatar Junio C Hamano1-27/+87
2012-03-01diff -p: squelch "diff --git" header for stat-dirty pathsLibravatar Junio C Hamano1-1/+1
2012-03-01diff --stat: add config option to limit graph widthLibravatar Zbigniew Jędrzejewski-Szmek1-0/+8
2012-03-01diff --stat: enable limiting of the graph partLibravatar Zbigniew Jędrzejewski-Szmek1-2/+21
2012-03-01diff --stat: use a maximum of 5/8 for the filename partLibravatar Zbigniew Jędrzejewski-Szmek1-30/+60
2012-03-01diff --stat: use the full terminal widthLibravatar Zbigniew Jędrzejewski-Szmek1-1/+4
2012-02-24Merge branches zj/decimal-width, zj/term-columns and jc/diff-stat-scalerLibravatar Junio C Hamano1-7/+20
2012-02-21Merge branch 'jc/diff-stat-scaler' into maintLibravatar Junio C Hamano1-7/+20
2012-02-20Merge branch 'jc/diff-stat-scaler'Libravatar Junio C Hamano1-7/+20
2012-02-19xdiff: PATIENCE/HISTOGRAM are not independent option bitsLibravatar Junio C Hamano1-2/+2
2012-02-14diff --stat: show bars of same length for paths with same amount of changesLibravatar Junio C Hamano1-7/+20
2012-02-14Merge branch 'jk/userdiff-config-simplify'Libravatar Junio C Hamano1-5/+2
2012-02-07drop odd return value semantics from userdiff_configLibravatar Jeff King1-5/+2
2012-02-03Use correct grammar in diffstat summary lineLibravatar Nguyễn Thái Ngọc Duy1-5/+51
2012-01-18Merge branch 'tr/maint-word-diff-incomplete-line'Libravatar Junio C Hamano1-0/+9
2012-01-12word-diff: ignore '\ No newline at eof' markerLibravatar Thomas Rast1-0/+9
2011-11-01Merge branch 'jc/maint-diffstat-numstat-context' into maintLibravatar Junio C Hamano1-0/+2
2011-10-21Merge branch 'rs/diff-cleanup-records-fix' into maintLibravatar Junio C Hamano1-0/+4
2011-10-19Merge branch 'rs/diff-whole-function'Libravatar Junio C Hamano1-0/+8
2011-10-13Merge branch 'rs/diff-cleanup-records-fix'Libravatar Junio C Hamano1-0/+4
2011-10-10Merge branch 'jc/maint-diffstat-numstat-context'Libravatar Junio C Hamano1-0/+2
2011-10-10diff: add option to show whole functions as contextLibravatar René Scharfe1-0/+8
2011-10-03diff: resurrect XDF_NEED_MINIMAL with --minimalLibravatar Junio C Hamano1-0/+4
2011-09-22diff: teach --stat/--numstat to honor -U$numLibravatar Junio C Hamano1-0/+2
2011-08-28Merge branch 'jk/color-and-pager'Libravatar Junio C Hamano1-28/+25
2011-08-19diff: don't load color config in plumbingLibravatar Jeff King1-1/+4
2011-08-19color: delay auto-color decision until point of useLibravatar Jeff King1-10/+7
2011-08-18git_config_colorbool: refactor stdout_is_tty handlingLibravatar Jeff King1-2/+2
2011-08-18diff: refactor COLOR_DIFF from a flag into an intLibravatar Jeff King1-22/+19