projects / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7505ae2 4ce6fb8)
Merge branch 'en/d-f-conflict-fix'
authorJunio C Hamano <gitster@pobox.com>
Wed, 8 Sep 2010 15:54:01 +0000 (08:54 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 8 Sep 2010 15:54:01 +0000 (08:54 -0700)
* en/d-f-conflict-fix:
  fast-export: ensure that a renamed file is printed after all references

1  2 
builtin/fast-export.c patch | diff1 | diff2 | blob | history

diff --cc builtin/fast-export.c
Simple merge
Git—the stupid content tracker