summaryrefslogtreecommitdiff
path: root/diff.c
AgeCommit message (Expand)AuthorFilesLines
2013-02-17Merge branch 'mp/diff-algo-config'Libravatar Junio C Hamano1-0/+34
2013-02-14Merge branch 'jk/diff-graph-cleanup'Libravatar Junio C Hamano1-97/+34
2013-02-12diff.c: use diff_line_prefix() where applicableLibravatar John Keeping1-95/+20
2013-02-12diff: add diff_line_prefix functionLibravatar John Keeping1-0/+10
2013-02-12diff.c: make constant string arguments constLibravatar John Keeping1-2/+4
2013-02-12diff: write prefix to the correct fileLibravatar John Keeping1-1/+1
2013-01-16diff: Introduce --diff-algorithm command line optionLibravatar Michal Privoznik1-1/+11
2013-01-16config: Introduce diff.algorithm variableLibravatar Michal Privoznik1-0/+24
2013-01-14Merge branch 'jc/blame-no-follow'Libravatar Junio C Hamano1-0/+2
2012-11-29Merge branch 'lt/diff-stat-show-0-lines'Libravatar Junio C Hamano1-25/+29
2012-11-27diff --shortstat: do not count "unmerged" entriesLibravatar Junio C Hamano1-3/+2
2012-11-27diff --stat: do not count "unmerged" entriesLibravatar Junio C Hamano1-2/+4
2012-11-27diff --stat: move the "total count" logic to the last loopLibravatar Junio C Hamano1-9/+12
2012-11-27diff --stat: use "file" temporary variable to refer to data->files[i]Libravatar Junio C Hamano1-13/+13
2012-11-27diff --stat: status of unmodified pair in diff-q is not zeroLibravatar Junio C Hamano1-1/+1
2012-11-25Merge branch 'rr/submodule-diff-config'Libravatar Junio C Hamano1-11/+35
2012-11-25Merge branch 'lt/diff-stat-show-0-lines'Libravatar Junio C Hamano1-10/+15
2012-11-18submodule: display summary header in boldLibravatar Ramkumar Ramachandra1-1/+1
2012-11-18diff: rename "set" variableLibravatar Jeff King1-6/+6
2012-11-18diff: introduce diff.submodule configuration variableLibravatar Ramkumar Ramachandra1-4/+28
2012-11-09Merge branch 'nd/builtin-to-libgit'Libravatar Jeff King1-0/+16
2012-11-09Merge branch 'mh/maint-parse-dirstat-fix'Libravatar Jeff King1-19/+21
2012-10-29Move setup_diff_pager to libgit.aLibravatar Nguyễn Thái Ngọc Duy1-0/+16
2012-10-29parse_dirstat_params(): use string_list to split comma-separated stringLibravatar Michael Haggerty1-19/+21
2012-10-17Fix "git diff --stat" for interesting - but empty - file changesLibravatar Linus Torvalds1-10/+15
2012-09-30diff: diff.context configuration gives default to -ULibravatar Jeff Muizelaar1-1/+8
2012-09-21diff: accept --no-follow optionLibravatar Junio C Hamano1-0/+2
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