├── 1.jpg ├── 2.jpg ├── README.md ├── index.html ├── logs_part1.txt ├── logs_part2.txt ├── logs_part3.txt ├── logs_part4.txt ├── logs_part5.txt └── page.html /1.jpg: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/vlad-web-dev/HW1-GIT/143a03e1cda29e339098f0b3f95b34070b810976/1.jpg -------------------------------------------------------------------------------- /2.jpg: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/vlad-web-dev/HW1-GIT/143a03e1cda29e339098f0b3f95b34070b810976/2.jpg -------------------------------------------------------------------------------- /README.md: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/vlad-web-dev/HW1-GIT/143a03e1cda29e339098f0b3f95b34070b810976/README.md -------------------------------------------------------------------------------- /index.html: -------------------------------------------------------------------------------- 1 | 2 | 3 | 4 | 5 | 7 | 8 | Document 9 | 10 | 20 | 21 |
22 | test img 23 | test img 24 |
25 | 26 | -------------------------------------------------------------------------------- /logs_part1.txt: -------------------------------------------------------------------------------- 1 | eed826a HEAD@{0}: merge develop: Fast-forward 2 | 65aaf56 HEAD@{1}: checkout: moving from develop to master 3 | eed826a HEAD@{2}: merge feature4: Fast-forward 4 | 472c32e HEAD@{3}: checkout: moving from feature4 to develop 5 | eed826a HEAD@{4}: rebase (finish): returning to refs/heads/feature4 6 | eed826a HEAD@{5}: rebase (pick): added style for img 7 | 472c32e HEAD@{6}: rebase (start): checkout develop 8 | 2e3d851 HEAD@{7}: checkout: moving from develop to feature4 9 | 472c32e HEAD@{8}: merge feature3: Fast-forward 10 | f75fdf5 HEAD@{9}: checkout: moving from feature3 to develop 11 | 472c32e HEAD@{10}: rebase (finish): returning to refs/heads/feature3 12 | 472c32e HEAD@{11}: rebase (pick): added style for img 13 | f75fdf5 HEAD@{12}: rebase (start): checkout develop 14 | e09b832 HEAD@{13}: checkout: moving from develop to feature3 15 | f75fdf5 HEAD@{14}: commit: changed body style 16 | 65aaf56 HEAD@{15}: checkout: moving from feature3 to develop 17 | e09b832 HEAD@{16}: checkout: moving from master to feature3 18 | 65aaf56 HEAD@{17}: merge develop: Fast-forward 19 | 3453dc8 HEAD@{18}: checkout: moving from develop to master 20 | 65aaf56 HEAD@{19}: checkout: moving from feature3 to develop 21 | e09b832 HEAD@{20}: checkout: moving from develop to feature3 22 | 65aaf56 HEAD@{21}: checkout: moving from feature4 to develop 23 | 2e3d851 HEAD@{22}: commit: added style for img 24 | 65aaf56 HEAD@{23}: checkout: moving from develop to feature4 25 | 65aaf56 HEAD@{24}: checkout: moving from feature4 to develop 26 | e09b832 HEAD@{25}: checkout: moving from feature3 to feature4 27 | e09b832 HEAD@{26}: commit: added style for img 28 | 65aaf56 HEAD@{27}: checkout: moving from develop to feature3 29 | 65aaf56 HEAD@{28}: checkout: moving from develop to develop 30 | 65aaf56 HEAD@{29}: merge feature2: Merge made by the 'recursive' strategy. 31 | 28d39aa HEAD@{30}: merge feature1: Fast-forward 32 | 71db179 HEAD@{31}: checkout: moving from feature2 to develop 33 | 4fd0eba HEAD@{32}: commit: added style for body 34 | 71db179 HEAD@{33}: checkout: moving from develop to feature2 35 | 71db179 HEAD@{34}: checkout: moving from feature1 to develop 36 | 28d39aa HEAD@{35}: commit: added images to html 37 | 03cbd8a HEAD@{36}: commit: added images 38 | 71db179 HEAD@{37}: checkout: moving from develop to feature1 39 | 71db179 HEAD@{38}: commit: added index.html 40 | 3453dc8 HEAD@{39}: checkout: moving from master to develop 41 | 3453dc8 HEAD@{40}: commit (initial): init 42 | -------------------------------------------------------------------------------- /logs_part2.txt: -------------------------------------------------------------------------------- 1 | 8ce7a0e HEAD@{0}: merge develop: Fast-forward 2 | 2fdca02 HEAD@{1}: checkout: moving from develop to master 3 | 8ce7a0e HEAD@{2}: merge feature5: Fast-forward 4 | 2fdca02 HEAD@{3}: checkout: moving from feature5 to develop 5 | 8ce7a0e HEAD@{4}: rebase (finish): returning to refs/heads/feature5 6 | 8ce7a0e HEAD@{5}: rebase (fixup): changed styles 7 | 5ba4af9 HEAD@{6}: rebase (reword): changed styles 8 | c286e79 HEAD@{7}: rebase: fast-forward 9 | 2fdca02 HEAD@{8}: rebase (start): checkout HEAD~2 10 | 709963c HEAD@{9}: commit: changed body bg color 11 | c286e79 HEAD@{10}: commit: changed style for img 12 | 2fdca02 HEAD@{11}: checkout: moving from develop to feature5 13 | 2fdca02 HEAD@{12}: checkout: moving from master to develop 14 | 2fdca02 HEAD@{13}: clone: from https://github.com/vlad-web-dev/HW1-GIT.git 15 | -------------------------------------------------------------------------------- /logs_part3.txt: -------------------------------------------------------------------------------- 1 | 1f649dc HEAD@{0}: reset: moving to HEAD~2 2 | d9b3e65 HEAD@{1}: commit: added changes to README 3 | 2ba8612 HEAD@{2}: commit: added changes 4 | 8ce7a0e HEAD@{3}: checkout: moving from master to develop -------------------------------------------------------------------------------- /logs_part4.txt: -------------------------------------------------------------------------------- 1 | d670306 HEAD@{0}: merge develop: Merge made by the 'recursive' strategy. 2 | 4f36059 HEAD@{1}: checkout: moving from develop to master 3 | 122abd6 HEAD@{2}: commit (merge): Merge branch 'feature6' into develop 4 | 1c03668 HEAD@{3}: commit: added changes 5 | 4a10c42 HEAD@{4}: checkout: moving from feature6 to develop 6 | fdbeb15 HEAD@{5}: commit: added changes 7 | 4a10c42 HEAD@{6}: checkout: moving from develop to feature6 8 | 4a10c42 HEAD@{7}: commit: added page.html 9 | 8ce7a0e HEAD@{8}: checkout: moving from master to develop -------------------------------------------------------------------------------- /logs_part5.txt: -------------------------------------------------------------------------------- 1 | a9e5341 HEAD@{0}: merge develop: Merge made by the 'recursive' strategy. 2 | 8d0b979 HEAD@{1}: checkout: moving from develop to master 3 | 8c6068f HEAD@{2}: cherry-pick: added changes 4 | 27cfaff HEAD@{3}: checkout: moving from feature7 to develop 5 | 78cea61 HEAD@{4}: checkout: moving from develop to feature7 6 | 27cfaff HEAD@{5}: checkout: moving from feature7 to develop 7 | aabdd1f HEAD@{6}: commit: added changes 8 | 122abd6 HEAD@{7}: checkout: moving from develop to feature7 9 | 122abd6 HEAD@{8}: checkout: moving from master to develop -------------------------------------------------------------------------------- /page.html: -------------------------------------------------------------------------------- 1 | 2 | 3 | 4 | 5 | 7 | 8 | testing 9 | 10 | 11 |
12 |

Hello world!

13 |
14 | 15 | --------------------------------------------------------------------------------