summaryrefslogtreecommitdiff
path: root/diff.c
AgeCommit message (Expand)AuthorFilesLines
2012-11-09Merge branch 'mh/maint-parse-dirstat-fix'Libravatar Jeff King1-19/+21
2012-10-29parse_dirstat_params(): use string_list to split comma-separated stringLibravatar Michael Haggerty1-19/+21
2012-09-30diff: diff.context configuration gives default to -ULibravatar Jeff Muizelaar1-1/+8
2012-09-20Merge branch 'nd/maint-diffstat-summary' into maintLibravatar Junio C Hamano1-6/+4
2012-09-18Merge branch 'jc/make-static'Libravatar Junio C Hamano1-1/+1
2012-09-17Merge branch 'nd/maint-diffstat-summary'Libravatar Junio C Hamano1-6/+4
2012-09-15diff.c: mark a private file-scope symbol as staticLibravatar Junio C Hamano1-1/+1
2012-09-14Revert diffstat back to EnglishLibravatar Nguyễn Thái Ngọc Duy1-6/+4
2012-09-11Sync with 1.7.11.6Libravatar Junio C Hamano1-3/+2
2012-09-11Merge branch 'ab/diff-write-incomplete-line' into maint-1.7.11Libravatar Junio C Hamano1-0/+1
2012-09-11Merge branch 'tr/void-diff-setup-done' into maint-1.7.11Libravatar Junio C Hamano1-3/+1
2012-09-10Merge branch 'maint-1.7.11' into maintLibravatar Junio C Hamano1-6/+10
2012-09-10Merge branch 'jk/maint-null-in-trees' into maint-1.7.11Libravatar Junio C Hamano1-6/+10
2012-08-27Merge branch 'ab/diff-write-incomplete-line'Libravatar Junio C Hamano1-0/+1
2012-08-27Merge branch 'jk/maint-null-in-trees'Libravatar Junio C Hamano1-6/+10
2012-08-22Merge branch 'tr/void-diff-setup-done'Libravatar Junio C Hamano1-3/+1
2012-08-05Fix '\ No newline...' annotation in rewrite diffsLibravatar Adam Butcher1-0/+1
2012-08-03diff_setup_done(): return voidLibravatar Thomas Rast1-3/+1
2012-07-31Merge branch 'nd/maint-i18n-diffstat'Libravatar Junio C Hamano1-1/+1
2012-07-30Merge branch 'jv/maint-no-ext-diff' into maintLibravatar Junio C Hamano1-3/+5
2012-07-29diff: do not use null sha1 as a sentinel valueLibravatar Jeff King1-6/+10
2012-07-26i18n: leave \n out of translated diffstatLibravatar Nguyễn Thái Ngọc Duy1-1/+1
2012-07-23Merge branch 'jv/maint-no-ext-diff'Libravatar Junio C Hamano1-3/+5
2012-07-22Merge branch 'jc/refactor-diff-stdin' into maintLibravatar Junio C Hamano1-20/+1
2012-07-17diff: correctly disable external_diff with --no-ext-diffLibravatar Junio C Hamano1-3/+5
2012-07-13Merge branch 'jc/refactor-diff-stdin'Libravatar Junio C Hamano1-20/+1
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