]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(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)
commit9f44723d1a2c6a97306a7160deeab621e08bea7a
tree0ad4ae4a8de137be14011c8b7f3b8c01875ce997tree | snapshot
parent7505ae272bad53c6451f34ff5f04ad24f29b6dd9commit | diff
parent4ce6fb805803cd9bf82c08c84a2fdc8cd6bae8efcommit | diff
Merge branch 'en/d-f-conflict-fix'

* en/d-f-conflict-fix:
  fast-export: ensure that a renamed file is printed after all references
builtin/fast-export.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.