]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: e596fd2 f31027c)
Merge branch 'jc/rename-degrade-cc-to-c' into maint
authorJunio C Hamano <gitster@pobox.com>
Tue, 31 May 2011 19:00:02 +0000 (12:00 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 31 May 2011 19:00:02 +0000 (12:00 -0700)
commitb3c89315a33fbded4a8c5d533ca8ddc6087e4c23
tree804bd0c440bcbd6c365460e5d60163b44cd8c200tree | snapshot
parente596fd295fbb6e7453cd541554ba27ab185f870dcommit | diff
parentf31027c99cb2ec4eb7ad8d1ebc7f0e20fef4bd1dcommit | diff
Merge branch 'jc/rename-degrade-cc-to-c' into maint

* 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
diff.h diff1 | diff2 | blob | history
diffcore-rename.c diff1 | diff2 | blob | history
merge-recursive.c diff1 | diff2 | blob | history
t/t4001-diff-rename.sh diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.