]> git.ipfire.org Git - thirdparty/git.git/commitdiff
projects / thirdparty / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0311e37 b174eb4)
Merge branch 'ap/maint-diff-rename-avoid-overlap' into maint-1.8.1
authorJunio C Hamano <gitster@pobox.com>
Wed, 3 Apr 2013 15:37:39 +0000 (08:37 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 3 Apr 2013 15:37:39 +0000 (08:37 -0700)
* ap/maint-diff-rename-avoid-overlap:
  tests: make sure rename pretty print works
  diff: prevent pprint_rename from underrunning input
  diff: Fix rename pretty-print when suffix and prefix overlap

1  2 
diff.c patch | diff1 | diff2 | blob | history

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