projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 77083da) | patch
When trying to map p4 integrations to git merges just record it as a single merge...
authorSimon Hausmann <simon@lst.de>
Mon, 12 Feb 2007 21:05:21 +0000 (22:05 +0100)
committerSimon Hausmann <simon@lst.de>
Mon, 12 Feb 2007 21:05:21 +0000 (22:05 +0100)
commit930d3cc94e98ccecfa8762ef79f7c29af4a72769
treef47556f5799eea8d3cd8795ec0a4d63fde22689ftree | snapshot
parent77083daac72612ab8ded6cba82a72924f3a867b4commit | diff
When trying to map p4 integrations to git merges just record it as a single merge with the newest p4 change as secondary parent.

Signed-off-by: Simon Hausmann <simon@lst.de>
contrib/fast-import/p4-fast-export.py diff | blob | history
Git—the stupid content tracker