summaryrefslogtreecommitdiff
path: root/diff.c
AgeCommit message (Expand)Author
2013-04-15Merge branch 'jk/diff-graph-submodule-summary'Junio C Hamano
2013-04-15Merge branch 'jk/diff-algo-finishing-touches'Junio C Hamano
2013-04-12Correct common spelling mistakes in comments and testsStefano Lattarini
2013-04-05submodule: print graph output next to submodule logJohn Keeping
2013-04-05diff: allow unstuck arguments with --diff-algorithmJohn Keeping
2013-04-01Merge branch 'ap/maint-diff-rename-avoid-overlap' into maintJunio C Hamano
2013-03-25Merge branch 'ap/maint-diff-rename-avoid-overlap'Junio C Hamano
2013-03-21diff.c: diff.renamelimit => diff.renameLimit in messageMax Nanasy
2013-02-26diff: prevent pprint_rename from underrunning inputThomas Rast
2013-02-24diff: Fix rename pretty-print when suffix and prefix overlapAntoine Pelisse
2013-02-17Merge branch 'mp/diff-algo-config'Junio C Hamano
2013-02-14Merge branch 'jk/diff-graph-cleanup'Junio C Hamano
2013-02-12diff.c: use diff_line_prefix() where applicableJohn Keeping
2013-02-12diff: add diff_line_prefix functionJohn Keeping
2013-02-12diff.c: make constant string arguments constJohn Keeping
2013-02-12diff: write prefix to the correct fileJohn Keeping
2013-01-16diff: Introduce --diff-algorithm command line optionMichal Privoznik
2013-01-16config: Introduce diff.algorithm variableMichal Privoznik
2013-01-14Merge branch 'jc/blame-no-follow'Junio C Hamano
2012-11-29Merge branch 'lt/diff-stat-show-0-lines'Junio C Hamano
2012-11-27diff --shortstat: do not count "unmerged" entriesJunio C Hamano
2012-11-27diff --stat: do not count "unmerged" entriesJunio C Hamano
2012-11-27diff --stat: move the "total count" logic to the last loopJunio C Hamano
2012-11-27diff --stat: use "file" temporary variable to refer to data->files[i]Junio C Hamano
2012-11-27diff --stat: status of unmodified pair in diff-q is not zeroJunio C Hamano
2012-11-26Merge branch 'rr/submodule-diff-config'Junio C Hamano
2012-11-26Merge branch 'lt/diff-stat-show-0-lines'Junio C Hamano
2012-11-19submodule: display summary header in boldRamkumar Ramachandra
2012-11-19diff: rename "set" variableJeff King
2012-11-19diff: introduce diff.submodule configuration variableRamkumar Ramachandra
2012-11-09Merge branch 'nd/builtin-to-libgit'Jeff King
2012-11-09Merge branch 'mh/maint-parse-dirstat-fix'Jeff King
2012-10-29Move setup_diff_pager to libgit.aNguyễn Thái Ngọc Duy
2012-10-29parse_dirstat_params(): use string_list to split comma-separated stringMichael Haggerty
2012-10-17Fix "git diff --stat" for interesting - but empty - file changesLinus Torvalds
2012-10-01diff: diff.context configuration gives default to -UJeff Muizelaar
2012-09-21diff: accept --no-follow optionJunio C Hamano
2012-09-20Merge branch 'nd/maint-diffstat-summary' into maintJunio C Hamano
2012-09-18Merge branch 'jc/make-static'Junio C Hamano
2012-09-17Merge branch 'nd/maint-diffstat-summary'Junio C Hamano
2012-09-16diff.c: mark a private file-scope symbol as staticJunio C Hamano
2012-09-14Revert diffstat back to EnglishNguyễn Thái Ngọc Duy
2012-09-11Sync with 1.7.11.6Junio C Hamano
2012-09-11Merge branch 'ab/diff-write-incomplete-line' into maint-1.7.11Junio C Hamano
2012-09-11Merge branch 'tr/void-diff-setup-done' into maint-1.7.11Junio C Hamano
2012-09-10Merge branch 'maint-1.7.11' into maintJunio C Hamano
2012-09-10Merge branch 'jk/maint-null-in-trees' into maint-1.7.11Junio C Hamano
2012-08-27Merge branch 'ab/diff-write-incomplete-line'Junio C Hamano
2012-08-27Merge branch 'jk/maint-null-in-trees'Junio C Hamano
2012-08-22Merge branch 'tr/void-diff-setup-done'Junio C Hamano