summaryrefslogtreecommitdiff
path: root/diff.h
AgeCommit message (Expand)AuthorFilesLines
2011-05-06Merge branch 'jc/fix-diff-files-unmerged'Libravatar Junio C Hamano1-4/+1
2011-04-28Merge branch 'jc/diff-irreversible-delete'Libravatar Junio C Hamano1-0/+1
2011-04-23diff: remove often unused parameters from diff_unmerge()Libravatar Junio C Hamano1-4/+1
2011-04-23diff.c: return filepair from diff_unmerge()Libravatar Junio C Hamano1-1/+1
2011-04-02git diff -D: omit the preimage of deletesLibravatar Junio C Hamano1-0/+1
2011-03-22diffcore-rename: fall back to -C when -C -C busts the rename limitLibravatar Junio C Hamano1-0/+2
2011-03-19Merge branch 'jk/merge-rename-ux'Libravatar Junio C Hamano1-1/+2
2011-02-21add inexact rename detection progress infrastructureLibravatar Jeff King1-0/+1
2011-02-21merge: improve inexact rename limit warningLibravatar Jeff King1-1/+1
2011-02-03Convert struct diff_options to use struct pathspecLibravatar Nguyễn Thái Ngọc Duy1-3/+1
2010-10-26Merge branch 'kb/merge-recursive-rename-threshold'Libravatar Junio C Hamano1-0/+2
2010-09-29merge-recursive: option to specify rename thresholdLibravatar Kevin Ballard1-0/+2
2010-08-31git log/diff: add -G<regexp> that greps in the patch textLibravatar Junio C Hamano1-0/+3
2010-08-21Merge branch 'mm/shortopt-detached'Libravatar Junio C Hamano1-0/+7
2010-08-18Merge branch 'jc/maint-follow-rename-fix'Libravatar Junio C Hamano1-0/+3
2010-08-13diff --follow: do call diffcore_std() as necessaryLibravatar Junio C Hamano1-0/+3
2010-08-09Submodules: Add the new "ignore" config option for diff and statusLibravatar Jens Lehmann1-0/+1
2010-08-06diff: parse separate options like -S fooLibravatar Matthieu Moy1-0/+7
2010-06-27Merge branch 'ab/blame-textconv'Libravatar Junio C Hamano1-0/+9
2010-06-21Merge branch 'gv/portable'Libravatar Junio C Hamano1-1/+1
2010-06-11textconv: make the API publicLibravatar Axel Bonnet1-0/+8
2010-05-31Add a prefix output callback to diff outputLibravatar Bo Yang1-0/+5
2010-05-31enums: omit trailing comma for portabilityLibravatar Gary V. Vaughan1-1/+1
2010-04-14diff: add --word-diff option that generalizes --color-wordsLibravatar Thomas Rast1-1/+9
2010-03-13git status: ignoring untracked files must apply to submodules tooLibravatar Jens Lehmann1-0/+1
2010-03-08git status: Show detailed dirty status of submodules in long formatLibravatar Jens Lehmann1-0/+1
2010-01-24Merge branch 'jc/fix-tree-walk'Libravatar Junio C Hamano1-0/+1
2010-01-18Performance optimization for detection of modified submodulesLibravatar Jens Lehmann1-4/+6
2010-01-07unpack-trees.c: look ahead in the indexLibravatar Junio C Hamano1-0/+1
2009-12-26Merge branch 'jc/1.7.0-diff-whitespace-only-status'Libravatar Junio C Hamano1-2/+2
2009-11-28Give the hunk comment its own colorLibravatar Bert Wesarg1-0/+1
2009-10-19Add the --submodule option to the diff option familyLibravatar Johannes Schindelin1-0/+3
2009-07-29diff: Rename QUIET internal option to QUICKLibravatar Junio C Hamano1-1/+1
2009-07-29diff: change semantics of "ignore whitespace" optionsLibravatar Junio C Hamano1-0/+1
2009-03-04Use DIFF_XDL_SET/DIFF_OPT_SET instead of raw bit-maskingLibravatar Keith Cascio1-0/+3
2009-02-10Generalize and libify index_is_dirty() to index_differs_from(...)Libravatar Stephan Beyer1-0/+2
2009-01-17color-words: take an optional regular expression describing wordsLibravatar Johannes Schindelin1-0/+1
2008-12-29diff: add option to show context between close hunksLibravatar René Scharfe1-0/+1
2008-10-26userdiff: require explicitly allowing textconvLibravatar Jeff King1-0/+1
2008-09-25Merge branch 'ho/dirstat-by-file'Libravatar Shawn O. Pearce1-0/+1
2008-09-18Merge branch 'jc/diff-prefix'Libravatar Junio C Hamano1-0/+2
2008-09-05diff --dirstat-by-file: count changed files, not linesLibravatar Heikki Orsila1-0/+1
2008-09-03diff --cumulative is a sub-option of --dirstatLibravatar Junio C Hamano1-1/+1
2008-08-30diff: vary default prefix depending on what are comparedLibravatar Junio C Hamano1-0/+2
2008-07-16Fix buffer overflow in git diffLibravatar Dmitry Potapov1-5/+4
2008-05-26Merge branch 'jc/diff-no-no-index'Libravatar Junio C Hamano1-4/+2
2008-05-25Merge branch 'js/config-cb'Libravatar Junio C Hamano1-2/+2
2008-05-24"git diff": do not ignore index without --no-indexLibravatar Junio C Hamano1-4/+2
2008-05-15diff options: Introduce --ignore-submodulesLibravatar Johannes Schindelin1-0/+1
2008-05-14Merge branch 'jk/renamelimit' (early part)Libravatar Junio C Hamano1-0/+1