Merge remote-tracking branch 'firmware_AIDA/master'
Used instructions at https://bneijt.nl/blog/post/merge-a-subdirectory-of-another-repository-with-git/ to merge in Paolo's firmware with FMC-TLU Git repository git clone git@github.com:DavidCussans/firmware_AIDA.git git clone ssh://git@ohwr.org/fmc-projects/fmc-mtlu.git cd fmc-mtlu/ git remote add firmware_AIDA ../firmware_AIDA git fetch firmware_AIDA git merge -s ours --no-commit --allow-unrelated-histories firmware_AIDA/master ( N.B. Had to add allow-unrelated-histories flag ... ) git read-tree --prefix=AIDA_tlu -u firmware_AIDA/master git commit
Showing
- AIDA_tlu/.gitignore 74 additions, 0 deletionsAIDA_tlu/.gitignore
- AIDA_tlu/Documentation/AIDA_TLU_note.pdf 0 additions, 0 deletionsAIDA_tlu/Documentation/AIDA_TLU_note.pdf
- AIDA_tlu/Documentation/AddressMap.xlsx 0 additions, 0 deletionsAIDA_tlu/Documentation/AddressMap.xlsx
- AIDA_tlu/Documentation/Connections.xlsx 0 additions, 0 deletionsAIDA_tlu/Documentation/Connections.xlsx
- AIDA_tlu/Documentation/Enclosure.docx 0 additions, 0 deletionsAIDA_tlu/Documentation/Enclosure.docx
- AIDA_tlu/Documentation/LUT6.xlsx 0 additions, 0 deletionsAIDA_tlu/Documentation/LUT6.xlsx
- AIDA_tlu/Documentation/Latex/AIDA_TLU_v1d.prj 62 additions, 0 deletionsAIDA_tlu/Documentation/Latex/AIDA_TLU_v1d.prj
- AIDA_tlu/Documentation/Latex/DUT_signals.tex 2 additions, 0 deletionsAIDA_tlu/Documentation/Latex/DUT_signals.tex
- AIDA_tlu/Documentation/Latex/Docs/Connections.pdf 0 additions, 0 deletionsAIDA_tlu/Documentation/Latex/Docs/Connections.pdf
- AIDA_tlu/Documentation/Latex/Docs/PM3TopView.pdf 0 additions, 0 deletionsAIDA_tlu/Documentation/Latex/Docs/PM3TopView.pdf
- AIDA_tlu/Documentation/Latex/Docs/schematics.pdf 0 additions, 0 deletionsAIDA_tlu/Documentation/Latex/Docs/schematics.pdf
- AIDA_tlu/Documentation/Latex/Images/20170315_121610.jpg 0 additions, 0 deletionsAIDA_tlu/Documentation/Latex/Images/20170315_121610.jpg
- AIDA_tlu/Documentation/Latex/Images/20170315_121623.jpg 0 additions, 0 deletionsAIDA_tlu/Documentation/Latex/Images/20170315_121623.jpg
- AIDA_tlu/Documentation/Latex/Images/20170315_121629.jpg 0 additions, 0 deletionsAIDA_tlu/Documentation/Latex/Images/20170315_121629.jpg
- AIDA_tlu/Documentation/Latex/Images/20170315_123824.jpg 0 additions, 0 deletionsAIDA_tlu/Documentation/Latex/Images/20170315_123824.jpg
- AIDA_tlu/Documentation/Latex/Images/20170315_125122.jpg 0 additions, 0 deletionsAIDA_tlu/Documentation/Latex/Images/20170315_125122.jpg
- AIDA_tlu/Documentation/Latex/Images/Initial.png 0 additions, 0 deletionsAIDA_tlu/Documentation/Latex/Images/Initial.png
- AIDA_tlu/Documentation/Latex/Images/LVDS_transceiver.pdf 0 additions, 0 deletionsAIDA_tlu/Documentation/Latex/Images/LVDS_transceiver.pdf
- AIDA_tlu/Documentation/Latex/Images/LVDS_transceiver.pptx 0 additions, 0 deletionsAIDA_tlu/Documentation/Latex/Images/LVDS_transceiver.pptx
- AIDA_tlu/Documentation/Latex/Images/PM3.jpg 0 additions, 0 deletionsAIDA_tlu/Documentation/Latex/Images/PM3.jpg
Please register or sign in to comment