summaryrefslogtreecommitdiff
path: root/diff.h
AgeCommit message (Expand)Author
2011-05-31Merge branch 'jc/rename-degrade-cc-to-c' into maintJunio C Hamano
2011-05-13Merge branch 'jc/fix-diff-files-unmerged' into maintJunio C Hamano
2011-04-24diff: remove often unused parameters from diff_unmerge()Junio C Hamano
2011-04-24diff.c: return filepair from diff_unmerge()Junio C Hamano
2011-03-22diffcore-rename: fall back to -C when -C -C busts the rename limitJunio C Hamano
2011-03-20Merge branch 'jk/merge-rename-ux'Junio C Hamano
2011-02-21add inexact rename detection progress infrastructureJeff King
2011-02-21merge: improve inexact rename limit warningJeff King
2011-02-03Convert struct diff_options to use struct pathspecNguyễn Thái Ngọc Duy
2010-10-27Merge branch 'kb/merge-recursive-rename-threshold'Junio C Hamano
2010-09-29merge-recursive: option to specify rename thresholdKevin Ballard
2010-08-31git log/diff: add -G<regexp> that greps in the patch textJunio C Hamano
2010-08-22Merge branch 'mm/shortopt-detached'Junio C Hamano
2010-08-18Merge branch 'jc/maint-follow-rename-fix'Junio C Hamano
2010-08-13diff --follow: do call diffcore_std() as necessaryJunio C Hamano
2010-08-09Submodules: Add the new "ignore" config option for diff and statusJens Lehmann
2010-08-06diff: parse separate options like -S fooMatthieu Moy
2010-06-27Merge branch 'ab/blame-textconv'Junio C Hamano
2010-06-21Merge branch 'gv/portable'Junio C Hamano
2010-06-11textconv: make the API publicAxel Bonnet
2010-06-01Add a prefix output callback to diff outputBo Yang
2010-05-31enums: omit trailing comma for portabilityGary V. Vaughan
2010-04-14diff: add --word-diff option that generalizes --color-wordsThomas Rast
2010-03-14git status: ignoring untracked files must apply to submodules tooJens Lehmann
2010-03-08git status: Show detailed dirty status of submodules in long formatJens Lehmann
2010-01-25Merge branch 'jc/fix-tree-walk'Junio C Hamano
2010-01-19Performance optimization for detection of modified submodulesJens Lehmann
2010-01-07unpack-trees.c: look ahead in the indexJunio C Hamano
2009-12-26Merge branch 'jc/1.7.0-diff-whitespace-only-status'Junio C Hamano
2009-11-28Give the hunk comment its own colorBert Wesarg
2009-10-20Add the --submodule option to the diff option familyJohannes Schindelin
2009-07-29diff: Rename QUIET internal option to QUICKJunio C Hamano
2009-07-29diff: change semantics of "ignore whitespace" optionsJunio C Hamano
2009-03-04Use DIFF_XDL_SET/DIFF_OPT_SET instead of raw bit-maskingKeith Cascio
2009-02-11Generalize and libify index_is_dirty() to index_differs_from(...)Stephan Beyer
2009-01-17color-words: take an optional regular expression describing wordsJohannes Schindelin
2008-12-29diff: add option to show context between close hunksRené Scharfe
2008-10-26userdiff: require explicitly allowing textconvJeff King
2008-09-25Merge branch 'ho/dirstat-by-file'Shawn O. Pearce
2008-09-19Merge branch 'jc/diff-prefix'Junio C Hamano
2008-09-05diff --dirstat-by-file: count changed files, not linesHeikki Orsila
2008-09-04diff --cumulative is a sub-option of --dirstatJunio C Hamano
2008-08-31diff: vary default prefix depending on what are comparedJunio C Hamano
2008-07-16Fix buffer overflow in git diffDmitry Potapov
2008-05-27Merge branch 'jc/diff-no-no-index'Junio C Hamano
2008-05-25Merge branch 'js/config-cb'v1.5.6-rc0Junio C Hamano
2008-05-24"git diff": do not ignore index without --no-indexJunio C Hamano
2008-05-15diff options: Introduce --ignore-submodulesJohannes Schindelin
2008-05-14Merge branch 'jk/renamelimit' (early part)Junio C Hamano
2008-05-14Provide git_config with a callback-data parameterJohannes Schindelin