diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-04-07 17:57:46 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-04-07 17:57:46 -0700 |
| commit | 45fa7608bd1abd4dca12b0b90a852e7a71377381 (patch) | |
| tree | 8cb0bf6b3cf363f3f9c1af2f37907d2e86165443 /diffcore-pathspec.c | |
| parent | Merge git://git.kernel.org/pub/scm/gitk/gitk (diff) | |
| parent | blame -S <ancestry-file> (diff) | |
| download | git-45fa7608bd1abd4dca12b0b90a852e7a71377381.tar.gz git-45fa7608bd1abd4dca12b0b90a852e7a71377381.zip | |
Merge branch 'jc/blame'
* jc/blame:
blame -S <ancestry-file>
Match ofs/cnt types in diff interface.
blame: use built-in xdiff
combine-diff: move the code to parse hunk-header into common library.
combine-diff: refactor built-in xdiff interface.
combine-diff: use built-in xdiff.
Diffstat (limited to 'diffcore-pathspec.c')
0 files changed, 0 insertions, 0 deletions