projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: d69dc37 5040f17)
Merge branch 'jc/blame'
authorJunio C Hamano <junkio@cox.net>
Sat, 8 Apr 2006 00:57:46 +0000 (17:57 -0700)
committerJunio C Hamano <junkio@cox.net>
Sat, 8 Apr 2006 00:57:46 +0000 (17:57 -0700)
commit45fa7608bd1abd4dca12b0b90a852e7a71377381
tree8cb0bf6b3cf363f3f9c1af2f37907d2e86165443tree | snapshot
parentd69dc373cbf58d88d19dcbc6cff37e12b17f8fd2commit | diff
parent5040f17eba15504bad66b14a645bddd9b015ebb7commit | diff
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.
Makefile diff1 | diff2 | blob | history
blame.c diff1 | diff2 | blob | history
The core git plumbing