summaryrefslogtreecommitdiff
path: root/diff.h
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jc/rename-degrade-cc-to-c' into maintJunio C Hamano2011-05-311-0/+2
|\
| * diffcore-rename: fall back to -C when -C -C busts the rename limitJunio C Hamano2011-03-221-0/+2
* | Merge branch 'jc/fix-diff-files-unmerged' into maintJunio C Hamano2011-05-131-4/+1
|\ \ | |/ |/|
| * diff: remove often unused parameters from diff_unmerge()Junio C Hamano2011-04-231-4/+1
| * diff.c: return filepair from diff_unmerge()Junio C Hamano2011-04-231-1/+1
* | Merge branch 'jk/merge-rename-ux'Junio C Hamano2011-03-191-1/+2
|\ \
| * | add inexact rename detection progress infrastructureJeff King2011-02-211-0/+1
| * | merge: improve inexact rename limit warningJeff King2011-02-211-1/+1
* | | Convert struct diff_options to use struct pathspecNguyễn Thái Ngọc Duy2011-02-031-3/+1
|/ /
* | Merge branch 'kb/merge-recursive-rename-threshold'Junio C Hamano2010-10-261-0/+2
|\ \
| * | merge-recursive: option to specify rename thresholdKevin Ballard2010-09-291-0/+2
* | | git log/diff: add -G<regexp> that greps in the patch textJunio C Hamano2010-08-311-0/+3
| |/ |/|
* | Merge branch 'mm/shortopt-detached'Junio C Hamano2010-08-211-0/+7
|\ \
| * | diff: parse separate options like -S fooMatthieu Moy2010-08-061-0/+7
| |/
* | Merge branch 'jc/maint-follow-rename-fix'Junio C Hamano2010-08-181-0/+3
|\ \
| * | diff --follow: do call diffcore_std() as necessaryJunio C Hamano2010-08-131-0/+3
| |/
* | Submodules: Add the new "ignore" config option for diff and statusJens Lehmann2010-08-091-0/+1
|/
* Merge branch 'ab/blame-textconv'Junio C Hamano2010-06-271-0/+9
|\
| * textconv: make the API publicAxel Bonnet2010-06-111-0/+8
* | Merge branch 'gv/portable'Junio C Hamano2010-06-211-1/+1
|\ \
| * | enums: omit trailing comma for portabilityGary V. Vaughan2010-05-311-1/+1
* | | Add a prefix output callback to diff outputBo Yang2010-05-311-0/+5
| |/ |/|
* | diff: add --word-diff option that generalizes --color-wordsThomas Rast2010-04-141-1/+9
|/
* git status: ignoring untracked files must apply to submodules tooJens Lehmann2010-03-131-0/+1
* git status: Show detailed dirty status of submodules in long formatJens Lehmann2010-03-081-0/+1
* Merge branch 'jc/fix-tree-walk'Junio C Hamano2010-01-241-0/+1
|\
| * unpack-trees.c: look ahead in the indexJunio C Hamano2010-01-071-0/+1
* | Performance optimization for detection of modified submodulesJens Lehmann2010-01-181-4/+6
* | Merge branch 'jc/1.7.0-diff-whitespace-only-status'Junio C Hamano2009-12-261-2/+2
|\ \ | |/ |/|
| * diff: Rename QUIET internal option to QUICKJunio C Hamano2009-07-291-1/+1
| * diff: change semantics of "ignore whitespace" optionsJunio C Hamano2009-07-291-0/+1
* | Give the hunk comment its own colorBert Wesarg2009-11-281-0/+1
* | Add the --submodule option to the diff option familyJohannes Schindelin2009-10-191-0/+3
|/
* Use DIFF_XDL_SET/DIFF_OPT_SET instead of raw bit-maskingKeith Cascio2009-03-041-0/+3
* Generalize and libify index_is_dirty() to index_differs_from(...)Stephan Beyer2009-02-101-0/+2
* color-words: take an optional regular expression describing wordsJohannes Schindelin2009-01-171-0/+1
* diff: add option to show context between close hunksRené Scharfe2008-12-291-0/+1
* userdiff: require explicitly allowing textconvJeff King2008-10-261-0/+1
* Merge branch 'ho/dirstat-by-file'Shawn O. Pearce2008-09-251-0/+1
|\
| * diff --dirstat-by-file: count changed files, not linesHeikki Orsila2008-09-051-0/+1
* | Merge branch 'jc/diff-prefix'Junio C Hamano2008-09-181-0/+2
|\ \ | |/ |/|
| * diff: vary default prefix depending on what are comparedJunio C Hamano2008-08-301-0/+2
* | diff --cumulative is a sub-option of --dirstatJunio C Hamano2008-09-031-1/+1
|/
* Fix buffer overflow in git diffDmitry Potapov2008-07-161-5/+4
* Merge branch 'jc/diff-no-no-index'Junio C Hamano2008-05-261-4/+2
|\
| * "git diff": do not ignore index without --no-indexJunio C Hamano2008-05-241-4/+2
* | Merge branch 'js/config-cb'v1.5.6-rc0Junio C Hamano2008-05-251-2/+2
|\ \
| * | Provide git_config with a callback-data parameterJohannes Schindelin2008-05-141-2/+2
* | | diff options: Introduce --ignore-submodulesJohannes Schindelin2008-05-151-0/+1
| |/ |/|
* | Merge branch 'jk/renamelimit' (early part)Junio C Hamano2008-05-141-0/+1
|\ \ | |/ |/|
View Lorry Controller Status