projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 78c6e0f f31027c)
Merge branch 'jc/rename-degrade-cc-to-c'
authorJunio C Hamano <gitster@pobox.com>
Thu, 28 Apr 2011 21:11:43 +0000 (14:11 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 28 Apr 2011 21:11:43 +0000 (14:11 -0700)
commit76a89d6d828486f96f42c69ef0cf87bb6b72fef5
treee5112817beba1e701d20e88b4d0c5bdf5fe7de0dtree | snapshot
parent78c6e0f3fa41d697f2e01850b0a361e21095545dcommit | diff
parentf31027c99cb2ec4eb7ad8d1ebc7f0e20fef4bd1dcommit | diff
Merge branch 'jc/rename-degrade-cc-to-c'

* jc/rename-degrade-cc-to-c:
  diffcore-rename: fall back to -C when -C -C busts the rename limit
  diffcore-rename: record filepair for rename src
  diffcore-rename: refactor "too many candidates" logic
  builtin/diff.c: remove duplicated call to diff_result_code()
builtin/diff.c diff1 | diff2 | blob | history
builtin/log.c diff1 | diff2 | blob | history
diff.c diff1 | diff2 | blob | history
merge-recursive.c diff1 | diff2 | blob | history
t/t4001-diff-rename.sh diff1 | diff2 | blob | history
Git—the stupid content tracker