Julien Dehos il y a 8 ans
Parent
commit
6facab48bf
100 fichiers modifiés avec 7 ajouts et 4 suppressions
  1. 2 1
      .gitignore
  2. 5 3
      Makefile
  3. 0 0
      images/branches_01.png
  4. 0 0
      images/branches_01.svg
  5. 0 0
      images/branches_02.png
  6. 0 0
      images/branches_02.svg
  7. 0 0
      images/branches_03.png
  8. 0 0
      images/branches_03.svg
  9. 0 0
      images/branches_04.png
  10. 0 0
      images/branches_04.svg
  11. 0 0
      images/branches_05.png
  12. 0 0
      images/branches_05.svg
  13. 0 0
      images/branches_06.png
  14. 0 0
      images/branches_06.svg
  15. 0 0
      images/branches_07.png
  16. 0 0
      images/branches_07.svg
  17. 0 0
      images/branches_08.png
  18. 0 0
      images/branches_08.svg
  19. 0 0
      images/branches_09.png
  20. 0 0
      images/branches_09.svg
  21. 0 0
      images/branches_10.png
  22. 0 0
      images/branches_10.svg
  23. 0 0
      images/branches_11.png
  24. 0 0
      images/branches_11.svg
  25. 0 0
      images/branches_12.png
  26. 0 0
      images/branches_13a.png
  27. 0 0
      images/branches_13b.png
  28. 0 0
      images/branches_14.png
  29. 0 0
      images/branches_15.png
  30. 0 0
      images/branches_16.png
  31. 0 0
      images/branches_17.png
  32. 0 0
      images/branches_18.png
  33. 0 0
      images/branches_20.png
  34. 0 0
      images/branches_21.png
  35. 0 0
      images/concepts_commits_1.svg
  36. 0 0
      images/concepts_commits_2.svg
  37. 0 0
      images/concepts_commits_3.svg
  38. 0 0
      images/concepts_depots_git.svg
  39. 0 0
      images/concepts_depots_svn.svg
  40. 0 0
      images/depot_distant_01.png
  41. 0 0
      images/depot_distant_02.png
  42. 0 0
      images/depot_distant_03.png
  43. 0 0
      images/depot_distant_04.png
  44. 0 0
      images/depot_distant_05.png
  45. 0 0
      images/depot_distant_06.png
  46. 0 0
      images/depot_distant_07a.png
  47. 0 0
      images/depot_distant_07a.svg
  48. 0 0
      images/depot_distant_07b.png
  49. 0 0
      images/depot_distant_07b.svg
  50. 0 0
      images/depot_distant_08.png
  51. 0 0
      images/depot_distant_08.svg
  52. 0 0
      images/depot_distant_09a.png
  53. 0 0
      images/depot_distant_09a.svg
  54. 0 0
      images/depot_distant_09b.png
  55. 0 0
      images/depot_distant_09b.svg
  56. 0 0
      images/depot_distant_10.png
  57. 0 0
      images/depot_distant_11.png
  58. 0 0
      images/depot_distant_12.png
  59. 0 0
      images/depot_distant_12a.svg
  60. 0 0
      images/depot_distant_12b.svg
  61. 0 0
      images/depot_distant_13.png
  62. 0 0
      images/depot_distant_14a.png
  63. 0 0
      images/depot_distant_14a.svg
  64. 0 0
      images/depot_distant_14b.png
  65. 0 0
      images/depot_distant_14b.svg
  66. 0 0
      images/depot_distant_15.png
  67. 0 0
      images/depot_local_01.png
  68. 0 0
      images/depot_local_02.png
  69. 0 0
      images/depot_local_03.png
  70. 0 0
      images/depot_local_04.png
  71. 0 0
      images/depot_local_05.png
  72. 0 0
      images/depot_local_06.png
  73. 0 0
      images/depot_local_07.png
  74. 0 0
      images/depot_local_07.svg
  75. 0 0
      images/depot_local_08.png
  76. 0 0
      images/depot_local_09.png
  77. 0 0
      images/depot_local_10.png
  78. 0 0
      images/depot_local_11.png
  79. 0 0
      images/depot_local_11.svg
  80. 0 0
      images/depot_local_12.png
  81. 0 0
      images/depot_local_13.png
  82. 0 0
      images/depot_local_14.png
  83. 0 0
      images/depot_local_15.png
  84. 0 0
      images/depot_local_15.svg
  85. 0 0
      images/depot_local_16.png
  86. 0 0
      images/depot_local_16.svg
  87. 0 0
      images/depot_local_17.png
  88. 0 0
      images/depot_local_17.svg
  89. 0 0
      images/depot_local_18.png
  90. 0 0
      images/depot_local_18.svg
  91. 0 0
      images/depot_local_19.png
  92. 0 0
      images/depot_local_20.png
  93. 0 0
      images/depot_local_20b.png
  94. 0 0
      images/depot_local_21.png
  95. 0 0
      images/depot_local_22.png
  96. 0 0
      images/depot_local_22b.png
  97. 0 0
      images/depot_local_checkout_01.svg
  98. 0 0
      images/depot_local_checkout_02.png
  99. 0 0
      images/depot_local_checkout_02.svg
  100. 0 0
      depot_local_checkout_03a.svg

+ 2 - 1
.gitignore

@@ -1,2 +1,3 @@
 .*~
-*.html
+./*.html
+tmp/*

+ 5 - 3
Makefile

@@ -2,16 +2,18 @@ MD_FILES = $(shell find -name "*.md")
 HTML_FILES = $(MD_FILES:.md=.html)
 
 all: $(HTML_FILES)
+	mkdir -p tmp
+	cp $(HTML_FILES) ./templates/template.css images/*.png images/*.svg ./tmp/
 
 before.html: before.md
 	pandoc --css template.css -o $@ $<
 
 %.html: %.md before.html 
-	pandoc --template template.html --css template.css --toc --toc-depth 2 --include-before before.html -o $@ $<
+	pandoc --template templates/template.html --css template.css --toc --toc-depth 2 --include-before before.html -o $@ $<
 
 publish:
-	scp $(HTML_FILES) *.svg *.png template.* yangra.univ-littoral.fr:public-html/enseignements/tutoriel_git/
+	scp ./tmp/* yangra.univ-littoral.fr:public-html/enseignements/tutoriel_git/
 
 clean:
-	rm -f $(HTML_FILES)
+	rm -rf $(HTML_FILES) ./tmp
 

branches_01.png → images/branches_01.png


branches_01.svg → images/branches_01.svg


branches_02.png → images/branches_02.png


branches_02.svg → images/branches_02.svg


branches_03.png → images/branches_03.png


branches_03.svg → images/branches_03.svg


branches_04.png → images/branches_04.png


branches_04.svg → images/branches_04.svg


branches_05.png → images/branches_05.png


branches_05.svg → images/branches_05.svg


branches_06.png → images/branches_06.png


branches_06.svg → images/branches_06.svg


branches_07.png → images/branches_07.png


branches_07.svg → images/branches_07.svg


branches_08.png → images/branches_08.png


branches_08.svg → images/branches_08.svg


branches_09.png → images/branches_09.png


branches_09.svg → images/branches_09.svg


branches_10.png → images/branches_10.png


branches_10.svg → images/branches_10.svg


branches_11.png → images/branches_11.png


branches_11.svg → images/branches_11.svg


branches_12.png → images/branches_12.png


branches_13a.png → images/branches_13a.png


branches_13b.png → images/branches_13b.png


branches_14.png → images/branches_14.png


branches_15.png → images/branches_15.png


branches_16.png → images/branches_16.png


branches_17.png → images/branches_17.png


branches_18.png → images/branches_18.png


branches_20.png → images/branches_20.png


branches_21.png → images/branches_21.png


concepts_commits_1.svg → images/concepts_commits_1.svg


concepts_commits_2.svg → images/concepts_commits_2.svg


concepts_commits_3.svg → images/concepts_commits_3.svg


concepts_depots_git.svg → images/concepts_depots_git.svg


concepts_depots_svn.svg → images/concepts_depots_svn.svg


depot_distant_01.png → images/depot_distant_01.png


depot_distant_02.png → images/depot_distant_02.png


depot_distant_03.png → images/depot_distant_03.png


depot_distant_04.png → images/depot_distant_04.png


depot_distant_05.png → images/depot_distant_05.png


depot_distant_06.png → images/depot_distant_06.png


depot_distant_07a.png → images/depot_distant_07a.png


depot_distant_07a.svg → images/depot_distant_07a.svg


depot_distant_07b.png → images/depot_distant_07b.png


depot_distant_07b.svg → images/depot_distant_07b.svg


depot_distant_08.png → images/depot_distant_08.png


depot_distant_08.svg → images/depot_distant_08.svg


depot_distant_09a.png → images/depot_distant_09a.png


depot_distant_09a.svg → images/depot_distant_09a.svg


depot_distant_09b.png → images/depot_distant_09b.png


depot_distant_09b.svg → images/depot_distant_09b.svg


depot_distant_10.png → images/depot_distant_10.png


depot_distant_11.png → images/depot_distant_11.png


depot_distant_12.png → images/depot_distant_12.png


depot_distant_12a.svg → images/depot_distant_12a.svg


depot_distant_12b.svg → images/depot_distant_12b.svg


depot_distant_13.png → images/depot_distant_13.png


depot_distant_14a.png → images/depot_distant_14a.png


depot_distant_14a.svg → images/depot_distant_14a.svg


depot_distant_14b.png → images/depot_distant_14b.png


depot_distant_14b.svg → images/depot_distant_14b.svg


depot_distant_15.png → images/depot_distant_15.png


depot_local_01.png → images/depot_local_01.png


depot_local_02.png → images/depot_local_02.png


depot_local_03.png → images/depot_local_03.png


depot_local_04.png → images/depot_local_04.png


depot_local_05.png → images/depot_local_05.png


depot_local_06.png → images/depot_local_06.png


depot_local_07.png → images/depot_local_07.png


depot_local_07.svg → images/depot_local_07.svg


depot_local_08.png → images/depot_local_08.png


depot_local_09.png → images/depot_local_09.png


depot_local_10.png → images/depot_local_10.png


depot_local_11.png → images/depot_local_11.png


depot_local_11.svg → images/depot_local_11.svg


depot_local_12.png → images/depot_local_12.png


depot_local_13.png → images/depot_local_13.png


depot_local_14.png → images/depot_local_14.png


depot_local_15.png → images/depot_local_15.png


depot_local_15.svg → images/depot_local_15.svg


depot_local_16.png → images/depot_local_16.png


depot_local_16.svg → images/depot_local_16.svg


depot_local_17.png → images/depot_local_17.png


depot_local_17.svg → images/depot_local_17.svg


depot_local_18.png → images/depot_local_18.png


depot_local_18.svg → images/depot_local_18.svg


depot_local_19.png → images/depot_local_19.png


depot_local_20.png → images/depot_local_20.png


depot_local_20b.png → images/depot_local_20b.png


depot_local_21.png → images/depot_local_21.png


depot_local_22.png → images/depot_local_22.png


depot_local_22b.png → images/depot_local_22b.png


depot_local_checkout_01.svg → images/depot_local_checkout_01.svg


depot_local_checkout_02.png → images/depot_local_checkout_02.png


depot_local_checkout_02.svg → images/depot_local_checkout_02.svg


+ 0 - 0
depot_local_checkout_03a.svg


Certains fichiers n'ont pas été affichés car il y a eu trop de fichiers modifiés dans ce diff