aboutsummaryrefslogtreecommitdiff
path: root/diff.h
Commit message (Expand)AuthorAge
* Merge branch 'jc/fix-diff-files-unmerged' into maintJunio C Hamano2011-05-13
|\
| * diff: remove often unused parameters from diff_unmerge()Junio C Hamano2011-04-23
| * diff.c: return filepair from diff_unmerge()Junio C Hamano2011-04-23
* | Merge branch 'jk/merge-rename-ux'Junio C Hamano2011-03-19
|\ \
| * | add inexact rename detection progress infrastructureJeff King2011-02-21
| * | merge: improve inexact rename limit warningJeff King2011-02-21
* | | Convert struct diff_options to use struct pathspecNguyễn Thái Ngọc Duy2011-02-03
|/ /
* | Merge branch 'kb/merge-recursive-rename-threshold'Junio C Hamano2010-10-26
|\ \
| * | merge-recursive: option to specify rename thresholdKevin Ballard2010-09-29
* | | git log/diff: add -G<regexp> that greps in the patch textJunio C Hamano2010-08-31
| |/ |/|
* | Merge branch 'mm/shortopt-detached'Junio C Hamano2010-08-21
|\ \
| * | diff: parse separate options like -S fooMatthieu Moy2010-08-06
| |/
* | Merge branch 'jc/maint-follow-rename-fix'Junio C Hamano2010-08-18
|\ \
| * | diff --follow: do call diffcore_std() as necessaryJunio C Hamano2010-08-13
| |/
* | Submodules: Add the new "ignore" config option for diff and statusJens Lehmann2010-08-09
|/
* Merge branch 'ab/blame-textconv'Junio C Hamano2010-06-27
|\
| * textconv: make the API publicAxel Bonnet2010-06-11
* | Merge branch 'gv/portable'Junio C Hamano2010-06-21
|\ \
| * | enums: omit trailing comma for portabilityGary V. Vaughan2010-05-31
* | | Add a prefix output callback to diff outputBo Yang2010-05-31
| |/ |/|
* | diff: add --word-diff option that generalizes --color-wordsThomas Rast2010-04-14
|/
* git status: ignoring untracked files must apply to submodules tooJens Lehmann2010-03-13
* git status: Show detailed dirty status of submodules in long formatJens Lehmann2010-03-08
* Merge branch 'jc/fix-tree-walk'Junio C Hamano2010-01-24
|\
| * unpack-trees.c: look ahead in the indexJunio C Hamano2010-01-07
* | Performance optimization for detection of modified submodulesJens Lehmann2010-01-18
* | Merge branch 'jc/1.7.0-diff-whitespace-only-status'Junio C Hamano2009-12-26
|\ \ | |/ |/|
| * diff: Rename QUIET internal option to QUICKJunio C Hamano2009-07-29
| * diff: change semantics of "ignore whitespace" optionsJunio C Hamano2009-07-29
* | Give the hunk comment its own colorBert Wesarg2009-11-28
* | Add the --submodule option to the diff option familyJohannes Schindelin2009-10-19
|/
* Use DIFF_XDL_SET/DIFF_OPT_SET instead of raw bit-maskingKeith Cascio2009-03-04
* Generalize and libify index_is_dirty() to index_differs_from(...)Stephan Beyer2009-02-10
* color-words: take an optional regular expression describing wordsJohannes Schindelin2009-01-17
* diff: add option to show context between close hunksRené Scharfe2008-12-29
* userdiff: require explicitly allowing textconvJeff King2008-10-26
* Merge branch 'ho/dirstat-by-file'Shawn O. Pearce2008-09-25
|\
| * diff --dirstat-by-file: count changed files, not linesHeikki Orsila2008-09-05
* | Merge branch 'jc/diff-prefix'Junio C Hamano2008-09-18
|\ \ | |/ |/|
| * diff: vary default prefix depending on what are comparedJunio C Hamano2008-08-30
* | diff --cumulative is a sub-option of --dirstatJunio C Hamano2008-09-03
|/
* Fix buffer overflow in git diffDmitry Potapov2008-07-16
* Merge branch 'jc/diff-no-no-index'Junio C Hamano2008-05-26
|\
| * "git diff": do not ignore index without --no-indexJunio C Hamano2008-05-24
* | Merge branch 'js/config-cb'v1.5.6-rc0Junio C Hamano2008-05-25
|\ \
| * | Provide git_config with a callback-data parameterJohannes Schindelin2008-05-14
* | | diff options: Introduce --ignore-submodulesJohannes Schindelin2008-05-15
| |/ |/|
* | Merge branch 'jk/renamelimit' (early part)Junio C Hamano2008-05-14
|\ \ | |/ |/|
| * diff: make "too many files" rename warning optionalJeff King2008-05-03
* | Remove dead code: show_log() sep argument and diff_options.msg_sepAdam Simpkins2008-05-03
|/