| Commit message (Expand) | Author | Age | Files | Lines |
* | diff: add option to show whole functions as contextrs/diff-whole-function | René Scharfe | 2011-10-10 | 1 | -0/+1 |
* | Merge branch 'jk/color-and-pager' | Junio C Hamano | 2011-08-28 | 1 | -2/+3 |
|\ |
|
| * | diff: refactor COLOR_DIFF from a flag into an int | Jeff King | 2011-08-18 | 1 | -2/+3 |
* | | Merge branch 'mg/diff-stat-count' | Junio C Hamano | 2011-06-29 | 1 | -0/+1 |
|\ \
| |/
|/| |
|
| * | diff: introduce --stat-lines to limit the stat lines | Michael J Gruber | 2011-05-27 | 1 | -0/+1 |
* | | Merge branch 'jk/diff-not-so-quick' | Junio C Hamano | 2011-06-06 | 1 | -0/+2 |
|\ \ |
|
| * | | diff: futureproof "stop feeding the backend early" logic | Junio C Hamano | 2011-05-31 | 1 | -0/+2 |
* | | | Merge branch 'jh/dirstat-lines' | Junio C Hamano | 2011-05-13 | 1 | -1/+2 |
|\ \ \ |
|
| * | | | New --dirstat=lines mode, doing dirstat analysis based on diffstat | Johan Herland | 2011-04-29 | 1 | -0/+1 |
| * | | | Allow specifying --dirstat cut-off percentage as a floating point number | Johan Herland | 2011-04-29 | 1 | -1/+1 |
| | |/
| |/| |
|
* | | | Merge branch 'jc/fix-diff-files-unmerged' | Junio C Hamano | 2011-05-06 | 1 | -4/+1 |
|\ \ \
| |/ /
|/| | |
|
| * | | diff: remove often unused parameters from diff_unmerge() | Junio C Hamano | 2011-04-23 | 1 | -4/+1 |
| * | | diff.c: return filepair from diff_unmerge() | Junio C Hamano | 2011-04-23 | 1 | -1/+1 |
* | | | Merge branch 'jc/diff-irreversible-delete' | Junio C Hamano | 2011-04-28 | 1 | -0/+1 |
|\ \ \ |
|
| * | | | git diff -D: omit the preimage of deletes | Junio C Hamano | 2011-04-02 | 1 | -0/+1 |
* | | | | diffcore-rename: fall back to -C when -C -C busts the rename limit | Junio C Hamano | 2011-03-22 | 1 | -0/+2 |
* | | | | Merge branch 'jk/merge-rename-ux' | Junio C Hamano | 2011-03-19 | 1 | -1/+2 |
|\ \ \ \
| |/ / /
|/| | | |
|
| * | | | add inexact rename detection progress infrastructure | Jeff King | 2011-02-21 | 1 | -0/+1 |
| * | | | merge: improve inexact rename limit warning | Jeff King | 2011-02-21 | 1 | -1/+1 |
* | | | | Convert struct diff_options to use struct pathspec | Nguyễn Thái Ngọc Duy | 2011-02-03 | 1 | -3/+1 |
|/ / / |
|
* | | | Merge branch 'kb/merge-recursive-rename-threshold' | Junio C Hamano | 2010-10-26 | 1 | -0/+2 |
|\ \ \ |
|
| * | | | merge-recursive: option to specify rename threshold | Kevin Ballard | 2010-09-29 | 1 | -0/+2 |
* | | | | git log/diff: add -G<regexp> that greps in the patch text | Junio C Hamano | 2010-08-31 | 1 | -0/+3 |
| |/ /
|/| | |
|
* | | | Merge branch 'mm/shortopt-detached' | Junio C Hamano | 2010-08-21 | 1 | -0/+7 |
|\ \ \ |
|
| * | | | diff: parse separate options like -S foo | Matthieu Moy | 2010-08-06 | 1 | -0/+7 |
| |/ / |
|
* | | | Merge branch 'jc/maint-follow-rename-fix' | Junio C Hamano | 2010-08-18 | 1 | -0/+3 |
|\ \ \ |
|
| * | | | diff --follow: do call diffcore_std() as necessary | Junio C Hamano | 2010-08-13 | 1 | -0/+3 |
| |/ / |
|
* | | | Submodules: Add the new "ignore" config option for diff and status | Jens Lehmann | 2010-08-09 | 1 | -0/+1 |
|/ / |
|
* | | Merge branch 'ab/blame-textconv' | Junio C Hamano | 2010-06-27 | 1 | -0/+9 |
|\ \ |
|
| * | | textconv: make the API public | Axel Bonnet | 2010-06-11 | 1 | -0/+8 |
* | | | Merge branch 'gv/portable' | Junio C Hamano | 2010-06-21 | 1 | -1/+1 |
|\ \ \ |
|
| * | | | enums: omit trailing comma for portability | Gary V. Vaughan | 2010-05-31 | 1 | -1/+1 |
* | | | | Add a prefix output callback to diff output | Bo Yang | 2010-05-31 | 1 | -0/+5 |
| |/ /
|/| | |
|
* | | | diff: add --word-diff option that generalizes --color-words | Thomas Rast | 2010-04-14 | 1 | -1/+9 |
|/ / |
|
* | | git status: ignoring untracked files must apply to submodules too | Jens Lehmann | 2010-03-13 | 1 | -0/+1 |
* | | git status: Show detailed dirty status of submodules in long format | Jens Lehmann | 2010-03-08 | 1 | -0/+1 |
* | | Merge branch 'jc/fix-tree-walk' | Junio C Hamano | 2010-01-24 | 1 | -0/+1 |
|\ \ |
|
| * | | unpack-trees.c: look ahead in the index | Junio C Hamano | 2010-01-07 | 1 | -0/+1 |
* | | | Performance optimization for detection of modified submodules | Jens Lehmann | 2010-01-18 | 1 | -4/+6 |
* | | | Merge branch 'jc/1.7.0-diff-whitespace-only-status' | Junio C Hamano | 2009-12-26 | 1 | -2/+2 |
|\ \ \
| |/ /
|/| /
| |/ |
|
| * | diff: Rename QUIET internal option to QUICK | Junio C Hamano | 2009-07-29 | 1 | -1/+1 |
| * | diff: change semantics of "ignore whitespace" options | Junio C Hamano | 2009-07-29 | 1 | -0/+1 |
* | | Give the hunk comment its own color | Bert Wesarg | 2009-11-28 | 1 | -0/+1 |
* | | Add the --submodule option to the diff option family | Johannes Schindelin | 2009-10-19 | 1 | -0/+3 |
|/ |
|
* | Use DIFF_XDL_SET/DIFF_OPT_SET instead of raw bit-masking | Keith Cascio | 2009-03-04 | 1 | -0/+3 |
* | Generalize and libify index_is_dirty() to index_differs_from(...) | Stephan Beyer | 2009-02-10 | 1 | -0/+2 |
* | color-words: take an optional regular expression describing words | Johannes Schindelin | 2009-01-17 | 1 | -0/+1 |
* | diff: add option to show context between close hunks | René Scharfe | 2008-12-29 | 1 | -0/+1 |
* | userdiff: require explicitly allowing textconv | Jeff King | 2008-10-26 | 1 | -0/+1 |
* | Merge branch 'ho/dirstat-by-file' | Shawn O. Pearce | 2008-09-25 | 1 | -0/+1 |
|\ |
|