summaryrefslogtreecommitdiff
path: root/diff.c
AgeCommit message (Expand)AuthorFilesLines
2013-07-22Merge branch 'nd/const-struct-cache-entry'Libravatar Junio C Hamano1-1/+1
2013-07-22Merge branch 'mm/diff-no-patch-synonym-to-s'Libravatar Junio C Hamano1-12/+18
2013-07-17diff: allow --patch & cie to override -s/--no-patchLibravatar Matthieu Moy1-11/+17
2013-07-17diff: allow --no-patch as synonym for -sLibravatar Matthieu Moy1-1/+1
2013-07-11Merge branch 'jc/maint-diff-core-safecrlf'Libravatar Junio C Hamano1-1/+9
2013-07-09Convert "struct cache_entry *" to "const ..." wherever possibleLibravatar Nguyễn Thái Ngọc Duy1-1/+1
2013-06-25diff: demote core.safecrlf=true to core.safecrlf=warnLibravatar Junio C Hamano1-1/+9
2013-06-19diff: add --ignore-blank-lines optionLibravatar Antoine Pelisse1-0/+2
2013-04-15Merge branch 'jk/diff-graph-submodule-summary'Libravatar Junio C Hamano1-0/+1
2013-04-15Merge branch 'jk/diff-algo-finishing-touches'Libravatar Junio C Hamano1-2/+3
2013-04-12Correct common spelling mistakes in comments and testsLibravatar Stefano Lattarini1-1/+1
2013-04-05submodule: print graph output next to submodule logLibravatar John Keeping1-0/+1
2013-04-05diff: allow unstuck arguments with --diff-algorithmLibravatar John Keeping1-2/+3
2013-04-01Merge branch 'ap/maint-diff-rename-avoid-overlap' into maintLibravatar Junio C Hamano1-1/+13
2013-03-25Merge branch 'ap/maint-diff-rename-avoid-overlap'Libravatar Junio C Hamano1-1/+13
2013-03-21diff.c: diff.renamelimit => diff.renameLimit in messageLibravatar Max Nanasy1-1/+1
2013-02-26diff: prevent pprint_rename from underrunning inputLibravatar Thomas Rast1-7/+10
2013-02-23diff: Fix rename pretty-print when suffix and prefix overlapLibravatar Antoine Pelisse1-1/+10
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