]> git.ipfire.org Git - thirdparty/git.git/commitdiff
projects / thirdparty / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 689b047 81b568c)
Merge branch 'rs/diff-cleanup-records-fix' into maint
authorJunio C Hamano <gitster@pobox.com>
Fri, 21 Oct 2011 17:49:25 +0000 (10:49 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 21 Oct 2011 17:49:25 +0000 (10:49 -0700)
* rs/diff-cleanup-records-fix:
  diff: resurrect XDF_NEED_MINIMAL with --minimal
  Revert removal of multi-match discard heuristic in 27af01

1  2 
diff.c patch | diff1 | diff2 | blob | history
xdiff/xprepare.c patch | diff1 | diff2 | blob | history

diff --cc diff.c
Simple merge
diff --cc xdiff/xprepare.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.