summaryrefslogtreecommitdiff
path: root/diff.c
AgeCommit message (Expand)Author
2010-08-18Merge branch 'jc/maint-follow-rename-fix'Junio C Hamano
2010-08-18Merge branch 'jl/submodule-ignore-diff'Junio C Hamano
2010-08-13diff --follow: do call diffcore_std() as necessaryJunio C Hamano
2010-08-11diff: strip extra "/" when stripping prefixJakub Narebski
2010-08-09Add the 'diff.ignoreSubmodules' config settingJohannes Schindelin
2010-08-09Submodules: Add the new "ignore" config option for diff and statusJens Lehmann
2010-08-03Merge branch 'sv/maint-diff-q-clear-fix' into maintJunio C Hamano
2010-08-02Fix DIFF_QUEUE_CLEAR refactoringJunio C Hamano
2010-07-09diff.c: fix a graph output bugBo Yang
2010-06-30Merge branch 'jl/status-ignore-submodules'Junio C Hamano
2010-06-30Merge branch 'jl/maint-diff-ignore-submodules'Junio C Hamano
2010-06-27Merge branch 'ab/blame-textconv'Junio C Hamano
2010-06-25Add the option "--ignore-submodules" to "git status"Jens Lehmann
2010-06-22Merge branch 'maint'Junio C Hamano
2010-06-22Merge branch 'cc/maint-diff-CC-binary' into maintJunio C Hamano
2010-06-21Merge branch 'bw/diff-metainfo-color' into maintJunio C Hamano
2010-06-21Merge branch 'rs/diff-no-minimal' into maintJunio C Hamano
2010-06-18Merge branch 'cc/maint-diff-CC-binary'Junio C Hamano
2010-06-18Merge branch 'by/diff-graph'Junio C Hamano
2010-06-18Merge branch 'jh/diff-index-line-abbrev'Junio C Hamano
2010-06-18Merge branch 'ec/diff-noprefix-config'Junio C Hamano
2010-06-13Merge branch 'bw/diff-metainfo-color'Junio C Hamano
2010-06-13Merge branch 'rs/diff-no-minimal'Junio C Hamano
2010-06-11Add optional parameters to the diff option "--ignore-submodules"Jens Lehmann
2010-06-11textconv: make the API publicAxel Bonnet
2010-06-06diff: fix "git show -C -C" output when renaming a binary fileChristian Couder
2010-06-01Make --color-words work well with --graphBo Yang
2010-06-01Emit a whole line in one goBo Yang
2010-06-01diff.c: Output the text graph padding before each diff lineBo Yang
2010-06-01Add a prefix output callback to diff outputBo Yang
2010-06-01diff.c: Ensure "index $from..$to" line contains unambiguous SHA1sJohan Herland
2010-05-21Merge branch 'by/log-follow'Junio C Hamano
2010-05-21Merge branch 'tr/word-diff'Junio C Hamano
2010-05-20diff: fix coloring of extended diff headersBert Wesarg
2010-05-19diff-options: make --patch a synonym for -pWill Palmer
2010-05-19diff: add configuration option for disabling diff prefixes.Eli Collins
2010-05-09Merge branch 'jk/cached-textconv'Junio C Hamano
2010-05-07Make diffcore_std only can run once before a diff_flushBo Yang
2010-05-07Add a macro DIFF_QUEUE_CLEAR.Bo Yang
2010-05-04Merge branch 'maint-1.7.0' into maintJunio C Hamano
2010-05-04remove ecb parameter from xdi_diff_outf()René Scharfe
2010-05-02git diff too slow for a fileRené Scharfe
2010-04-23Merge branch 'jk/maint-diffstat-overflow' into maintJunio C Hamano
2010-04-19Merge branch 'jk/maint-diffstat-overflow'Junio C Hamano
2010-04-17diff: use large integers for diffstat calculationsJeff King
2010-04-14diff: add --word-diff option that generalizes --color-wordsThomas Rast
2010-04-10Merge branch 'jc/conflict-marker-size' into maintJunio C Hamano
2010-04-09Merge early parts of jk/cached-textconvJunio C Hamano
2010-04-09diff.c: work around pointer constness warningsJunio C Hamano
2010-04-06Merge branch 'jc/conflict-marker-size'Junio C Hamano