]> git.ipfire.org Git - thirdparty/git.git/commitdiff
projects / thirdparty / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ebe8621 d7c9bf2)
Merge branch 'mz/maint-rename-unmerged' into maint
authorJunio C Hamano <gitster@pobox.com>
Fri, 13 May 2011 17:41:24 +0000 (10:41 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 13 May 2011 17:41:24 +0000 (10:41 -0700)
* mz/maint-rename-unmerged:
  diffcore-rename: don't consider unmerged path as source

1  2 
diffcore-rename.c patch | diff1 | diff2 | blob | history
t/t7060-wtstatus.sh patch | diff1 | diff2 | blob | history

diff --cc diffcore-rename.c
Simple merge
diff --cc t/t7060-wtstatus.sh
Simple merge
Unnamed repository; edit this file 'description' to name the repository.