From a2163c9d309114c0083654d895995f8a53b17f8a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafael=20L=C3=A1szl=C3=B3?= <rlacko99@gmail.com> Date: Fri, 12 Mar 2021 19:22:44 +0100 Subject: [PATCH] converted to Docute --- .gitignore | 1 + .gitlab-ci.yml | 25 + .magic_ssh_config | 5 + LICENSE | 674 ++++++++++++++++++ README.md | 8 +- docs/.nojekyll | 0 docs/README.md | 41 -- docs/_sidebar.md | 41 -- docs/index.html | 31 - examples/1-docx-hell/asd.docx | 0 examples/1-docx-hell/asdasd.docx | 0 examples/1-docx-hell/asdasdasdasd.docx | 0 examples/1-docx-hell/elso_beadasom.docx | 0 ... (1) Jav\303\255tott m\303\241solata.docx" | 0 ...masodik_beadasom (1) Jav\303\255tott.docx" | 0 .../1-docx-hell/masodik_beadasom (1).docx | 0 examples/1-docx-hell/masodik_beadasom.docx | 0 .../2020/09/13/elso_beadasom.docx | 0 .../2020/09/19/masodik_beadasom_felkesz.docx | 0 .../2020/09/20/masodik_beadasom.docx | 0 .../2020/09/20/masodik_beadasom_javitott.docx | 0 .../2020/09/20/masodik_beadasom_vegleges.docx | 0 .../2020/09/ideiglenes/asd.docx | 0 .../2020/09/ideiglenes/asdasd.docx | 0 .../2020/09/ideiglenes/asdasdadsads.docx | 0 favicon.ico | Bin 0 -> 6518 bytes {docs => guide}/intro/1_intro.md | 8 +- {docs => guide}/intro/2_versioning.md | 3 - {docs => guide}/intro/3_history.md | 3 - {docs => guide}/intro/img/me.jpg | Bin {docs => guide}/intro/img/vcstype_central.png | Bin .../intro/img/vcstype_distributed.png | Bin {docs => guide}/intro/img/vcstype_local.png | Bin {docs => guide}/remote/1_basics.md | 2 - {docs => guide}/workshop/1_installation.md | 3 - {docs => guide}/workshop/2_basics.md | 3 - {docs => guide}/workshop/3_branch.md | 3 - {docs => guide}/workshop/img/.gitkeep | 0 .../workshop/img/basic-branching.png | Bin .../workshop/img/commit-and-tree.png | Bin .../workshop/img/commits-and-parents.png | Bin .../workshop/img/git_lifecycle.png | Bin {docs => guide}/workshop/img/tree_awesome.png | Bin .../workshop/img/tree_with_one_branch.png | Bin index.html | 95 +++ package-lock.json | 303 ++++++++ package.json | 13 + style.css | 12 + 48 files changed, 1138 insertions(+), 136 deletions(-) create mode 100644 .gitignore create mode 100644 .gitlab-ci.yml create mode 100644 .magic_ssh_config create mode 100644 LICENSE delete mode 100644 docs/.nojekyll delete mode 100644 docs/README.md delete mode 100644 docs/_sidebar.md delete mode 100644 docs/index.html delete mode 100644 examples/1-docx-hell/asd.docx delete mode 100644 examples/1-docx-hell/asdasd.docx delete mode 100644 examples/1-docx-hell/asdasdasdasd.docx delete mode 100644 examples/1-docx-hell/elso_beadasom.docx delete mode 100644 "examples/1-docx-hell/masodik_beadasom (1) Jav\303\255tott m\303\241solata.docx" delete mode 100644 "examples/1-docx-hell/masodik_beadasom (1) Jav\303\255tott.docx" delete mode 100644 examples/1-docx-hell/masodik_beadasom (1).docx delete mode 100644 examples/1-docx-hell/masodik_beadasom.docx delete mode 100644 examples/2-docx-hell-folders/2020/09/13/elso_beadasom.docx delete mode 100644 examples/2-docx-hell-folders/2020/09/19/masodik_beadasom_felkesz.docx delete mode 100644 examples/2-docx-hell-folders/2020/09/20/masodik_beadasom.docx delete mode 100644 examples/2-docx-hell-folders/2020/09/20/masodik_beadasom_javitott.docx delete mode 100644 examples/2-docx-hell-folders/2020/09/20/masodik_beadasom_vegleges.docx delete mode 100644 examples/2-docx-hell-folders/2020/09/ideiglenes/asd.docx delete mode 100644 examples/2-docx-hell-folders/2020/09/ideiglenes/asdasd.docx delete mode 100644 examples/2-docx-hell-folders/2020/09/ideiglenes/asdasdadsads.docx create mode 100644 favicon.ico rename {docs => guide}/intro/1_intro.md (82%) rename {docs => guide}/intro/2_versioning.md (97%) rename {docs => guide}/intro/3_history.md (91%) rename {docs => guide}/intro/img/me.jpg (100%) rename {docs => guide}/intro/img/vcstype_central.png (100%) rename {docs => guide}/intro/img/vcstype_distributed.png (100%) rename {docs => guide}/intro/img/vcstype_local.png (100%) rename {docs => guide}/remote/1_basics.md (98%) rename {docs => guide}/workshop/1_installation.md (97%) rename {docs => guide}/workshop/2_basics.md (99%) rename {docs => guide}/workshop/3_branch.md (99%) rename {docs => guide}/workshop/img/.gitkeep (100%) rename {docs => guide}/workshop/img/basic-branching.png (100%) rename {docs => guide}/workshop/img/commit-and-tree.png (100%) rename {docs => guide}/workshop/img/commits-and-parents.png (100%) rename {docs => guide}/workshop/img/git_lifecycle.png (100%) rename {docs => guide}/workshop/img/tree_awesome.png (100%) rename {docs => guide}/workshop/img/tree_with_one_branch.png (100%) create mode 100644 index.html create mode 100644 package-lock.json create mode 100644 package.json create mode 100644 style.css diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..b512c09 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +node_modules \ No newline at end of file diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml new file mode 100644 index 0000000..c88a5d2 --- /dev/null +++ b/.gitlab-ci.yml @@ -0,0 +1,25 @@ +image: kroniak/ssh-client + +stages: + - deploy + +home: + stage: deploy + before_script: + - eval $(ssh-agent -s) + - echo "$SSH" | tr -d '\r' | ssh-add - + - mkdir -p ~/.ssh/socket + - chmod 700 ~/.ssh + - cp .magic_ssh_config ~/.ssh/config + script: + # AFS magic incoming + - ssh rlacko@centaur.sch.bme.hu cp /afs/sch.bme.hu/home/rlacko/.system/rlacko.keytab /tmp/rlacko.keytab + - ssh rlacko@centaur.sch.bme.hu kinit -k -t /tmp/rlacko.keytab rlacko + - ssh rlacko@centaur.sch.bme.hu rm /tmp/rlacko.keytab + - ssh rlacko@centaur.sch.bme.hu aklog sch.bme.hu -k SCH.BME.HU + - ssh rlacko@centaur.sch.bme.hu mkdir -p /home/rlacko/public_html/git + # actual work + - scp -r $PWD/* rlacko@centaur.sch.bme.hu:/home/rlacko/public_html/git/ + only: + refs: + - master diff --git a/.magic_ssh_config b/.magic_ssh_config new file mode 100644 index 0000000..f1c21a1 --- /dev/null +++ b/.magic_ssh_config @@ -0,0 +1,5 @@ +Host * + StrictHostKeyChecking no + ControlMaster auto + ControlPersist yes + ControlPath ~/.ssh/socket/%r@%h:%p diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..eb893ad --- /dev/null +++ b/LICENSE @@ -0,0 +1,674 @@ + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/> + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU General Public License is a free, copyleft license for +software and other kinds of works. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights. + + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. + + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. + + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. + + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Use with the GNU Affero General Public License. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU Affero General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + <one line to give the program's name and a brief idea of what it does.> + Copyright (C) <year> <name of author> + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. + +Also add information on how to contact you by electronic and paper mail. + + If the program does terminal interaction, make it output a short +notice like this when it starts in an interactive mode: + + <program> Copyright (C) <year> <name of author> + This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, your program's commands +might be different; for a GUI interface, you would use an "about box". + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU GPL, see +<http://www.gnu.org/licenses/>. + + The GNU General Public License does not permit incorporating your program +into proprietary programs. If your program is a subroutine library, you +may consider it more useful to permit linking proprietary applications with +the library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. But first, please read +<http://www.gnu.org/philosophy/why-not-lgpl.html>. \ No newline at end of file diff --git a/README.md b/README.md index 3f1a389..e587fec 100644 --- a/README.md +++ b/README.md @@ -1 +1,7 @@ -# Git elÅ‘adás +# Git doksi + +[BevezetÅ‘](/guide/intro/1_intro.md) + +<script> + window.location.href += "guide/intro/1_intro.md"; +</script> diff --git a/docs/.nojekyll b/docs/.nojekyll deleted file mode 100644 index e69de29..0000000 diff --git a/docs/README.md b/docs/README.md deleted file mode 100644 index 08c17e4..0000000 --- a/docs/README.md +++ /dev/null @@ -1,41 +0,0 @@ -# Tartalom - -- BevezetÅ‘ - - - [Intro](intro/1_intro.md?id=intro) - - [Verziókezelés](intro/2_versioning.md?id=verziókezelés) - - [Helyi](intro/2_versioning.md?id=helyi) - - [KözpontosÃtott](intro/2_versioning.md?id=központosÃtott) - - [Megosztott](intro/2_versioning.md?id=megosztott) - - [Git története](intro/3_history.md?id=git-története) - -- Git használata - - - [TelepÃtés és konfiguráció](workshop/1_installation.md?id=telepÃtés-és-konfiguráció) - - [TelepÃtés](workshop/1_installation.md?id=telepÃtés) - - [Konfiguráció](workshop/1_installation.md?id=konfiguráció) - - [Alapok](workshop/2_basics.md?id=alapok) - - [Repository](workshop/2_basics.md?id=repository) - - [Mentéseink tárolása](workshop/2_basics.md?id=mentéseink-tárolása) - - [Változtatások mentése](workshop/2_basics.md?id=változtatások-mentése) - - [Fájlok mozgatása](workshop/2_basics.md?id=fájlok-mozgatása) - - [Mentési elÅ‘zmények](workshop/2_basics.md?id=mentési-elÅ‘zmények) - - [Branch-ek, elágazás](workshop/3_branch.md?id=branch-ek-elágazás) - - [Mik azok a branch-ek?](workshop/3_branch.md?id=mik-azok-a-branch-ek) - - [Hogy épül fel?](workshop/3_branch.md?id=hogy-épül-fel) - - [Ãgak közti mozgás](workshop/3_branch.md?id=Ãgak-közti-mozgás) - - [Mergelés](workshop/3_branch.md?id=mergelés) - - [Merge conflict](workshop/3_branch.md?id=merge-conlict) - -- Távoli Repository - - - [Alapok és SSH kulcs](remote/1_basics.md) - - [Alapok](remote/1_basics.md?id=alapok) - - [SSH](remote/1_basics.md?id=ssh) - - [Saját SSH kulcs](remote/1_basics.md?id=saját-ssh-kulcs) - - [Linuxon / MacOS-en](remote/1_basics.md?id=linuxon-macos-en) - - [Windowson](remote/1_basics.md?id=windowson) - -- Forrás - - - [Pro Git könyv](https://git-scm.com/book/en/v2/) diff --git a/docs/_sidebar.md b/docs/_sidebar.md deleted file mode 100644 index 6b5401a..0000000 --- a/docs/_sidebar.md +++ /dev/null @@ -1,41 +0,0 @@ -- [FÅ‘oldal]() - -- BevezetÅ‘ - - - [Intro](intro/1_intro.md?id=intro) - - [Verziókezelés](intro/2_versioning.md?id=verziókezelés) - - [Helyi](intro/2_versioning.md?id=helyi) - - [KözpontosÃtott](intro/2_versioning.md?id=központosÃtott) - - [Megosztott](intro/2_versioning.md?id=megosztott) - - [Git története](intro/3_history.md?id=git-története) - -- Git használata - - - [TelepÃtés és konfiguráció](workshop/1_installation.md?id=telepÃtés-és-konfiguráció) - - [TelepÃtés](workshop/1_installation.md?id=telepÃtés) - - [Konfiguráció](workshop/1_installation.md?id=konfiguráció) - - [Alapok](workshop/2_basics.md?id=alapok) - - [Repository](workshop/2_basics.md?id=repository) - - [Mentéseink tárolása](workshop/2_basics.md?id=mentéseink-tárolása) - - [Változtatások mentése](workshop/2_basics.md?id=változtatások-mentése) - - [Fájlok mozgatása](workshop/2_basics.md?id=fájlok-mozgatása) - - [Mentési elÅ‘zmények](workshop/2_basics.md?id=mentési-elÅ‘zmények) - - [Branch-ek, elágazás](workshop/3_branch.md?id=branch-ek-elágazás) - - [Mik azok a branch-ek?](workshop/3_branch.md?id=mik-azok-a-branch-ek) - - [Hogy épül fel?](workshop/3_branch.md?id=hogy-épül-fel) - - [Ãgak közti mozgás](workshop/3_branch.md?id=Ãgak-közti-mozgás) - - [Mergelés](workshop/3_branch.md?id=mergelés) - - [Merge conflict](workshop/3_branch.md?id=merge-conlict) - -- Távoli Repository - - - [Alapok és SSH kulcs](remote/1_basics.md) - - [Alapok](remote/1_basics.md?id=alapok) - - [SSH](remote/1_basics.md?id=ssh) - - [Saját SSH kulcs](remote/1_basics.md?id=saját-ssh-kulcs) - - [Linuxon / MacOS-en](remote/1_basics.md?id=linuxon-macos-en) - - [Windowson](remote/1_basics.md?id=windowson) - -- Forrás - - - [Pro Git könyv](https://git-scm.com/book/en/v2/) diff --git a/docs/index.html b/docs/index.html deleted file mode 100644 index 52d21b1..0000000 --- a/docs/index.html +++ /dev/null @@ -1,31 +0,0 @@ -<!DOCTYPE html> -<html lang="en"> - <head> - <meta charset="UTF-8" /> - <title>Document</title> - <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" /> - <meta name="description" content="Description" /> - <meta - name="viewport" - content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0" - /> - <link - rel="stylesheet" - href="//cdn.jsdelivr.net/npm/docsify/themes/vue.css" - /> - </head> - <body> - <div id="app"></div> - <script> - window.$docsify = { - loadSidebar: true, - alias: { - "/.*/_sidebar.md": "/_sidebar.md", - }, - name: "", - repo: "", - }; - </script> - <script src="//cdn.jsdelivr.net/npm/docsify/lib/docsify.min.js"></script> - </body> -</html> diff --git a/examples/1-docx-hell/asd.docx b/examples/1-docx-hell/asd.docx deleted file mode 100644 index e69de29..0000000 diff --git a/examples/1-docx-hell/asdasd.docx b/examples/1-docx-hell/asdasd.docx deleted file mode 100644 index e69de29..0000000 diff --git a/examples/1-docx-hell/asdasdasdasd.docx b/examples/1-docx-hell/asdasdasdasd.docx deleted file mode 100644 index e69de29..0000000 diff --git a/examples/1-docx-hell/elso_beadasom.docx b/examples/1-docx-hell/elso_beadasom.docx deleted file mode 100644 index e69de29..0000000 diff --git "a/examples/1-docx-hell/masodik_beadasom (1) Jav\303\255tott m\303\241solata.docx" "b/examples/1-docx-hell/masodik_beadasom (1) Jav\303\255tott m\303\241solata.docx" deleted file mode 100644 index e69de29..0000000 diff --git "a/examples/1-docx-hell/masodik_beadasom (1) Jav\303\255tott.docx" "b/examples/1-docx-hell/masodik_beadasom (1) Jav\303\255tott.docx" deleted file mode 100644 index e69de29..0000000 diff --git a/examples/1-docx-hell/masodik_beadasom (1).docx b/examples/1-docx-hell/masodik_beadasom (1).docx deleted file mode 100644 index e69de29..0000000 diff --git a/examples/1-docx-hell/masodik_beadasom.docx b/examples/1-docx-hell/masodik_beadasom.docx deleted file mode 100644 index e69de29..0000000 diff --git a/examples/2-docx-hell-folders/2020/09/13/elso_beadasom.docx b/examples/2-docx-hell-folders/2020/09/13/elso_beadasom.docx deleted file mode 100644 index e69de29..0000000 diff --git a/examples/2-docx-hell-folders/2020/09/19/masodik_beadasom_felkesz.docx b/examples/2-docx-hell-folders/2020/09/19/masodik_beadasom_felkesz.docx deleted file mode 100644 index e69de29..0000000 diff --git a/examples/2-docx-hell-folders/2020/09/20/masodik_beadasom.docx b/examples/2-docx-hell-folders/2020/09/20/masodik_beadasom.docx deleted file mode 100644 index e69de29..0000000 diff --git a/examples/2-docx-hell-folders/2020/09/20/masodik_beadasom_javitott.docx b/examples/2-docx-hell-folders/2020/09/20/masodik_beadasom_javitott.docx deleted file mode 100644 index e69de29..0000000 diff --git a/examples/2-docx-hell-folders/2020/09/20/masodik_beadasom_vegleges.docx b/examples/2-docx-hell-folders/2020/09/20/masodik_beadasom_vegleges.docx deleted file mode 100644 index e69de29..0000000 diff --git a/examples/2-docx-hell-folders/2020/09/ideiglenes/asd.docx b/examples/2-docx-hell-folders/2020/09/ideiglenes/asd.docx deleted file mode 100644 index e69de29..0000000 diff --git a/examples/2-docx-hell-folders/2020/09/ideiglenes/asdasd.docx b/examples/2-docx-hell-folders/2020/09/ideiglenes/asdasd.docx deleted file mode 100644 index e69de29..0000000 diff --git a/examples/2-docx-hell-folders/2020/09/ideiglenes/asdasdadsads.docx b/examples/2-docx-hell-folders/2020/09/ideiglenes/asdasdadsads.docx deleted file mode 100644 index e69de29..0000000 diff --git a/favicon.ico b/favicon.ico new file mode 100644 index 0000000000000000000000000000000000000000..145b4b057df8753aadf185882a3d6e97d8f3c4a2 GIT binary patch literal 6518 zcmeH}TWB0r7{^bvu~lr-sC`f**<@yCcJm-;phOf}Ym(ia+1<3JSQISg*%#l%Qc4x^ zrI4mVP>aw$R1keAif^&?QiZ&<`cSGdw%R0SyGizbX`1o>otd*Uv)RmUHW5J*I5~4U z-}n3e|8tpTtcBgjcJF5BeJs$*n8FzI`K<fL7>nas0M9T4Bh2UM7{l|%|HfP8P;#^@ zvUG~EiEWL?(MZIGQ)9t+*-(e>8ge*&y73(2tx_m;COEWg1QAQ|!GkNvkwuR2ItnIR zrAX>b4`S6=&hSO<T<!`ley79=$YB^hEj_k&9pH-Cc*&3>OV^qF)%M4GCm)iv%<sI8 zLxv%1*%~<}wn5{V$;}!{ykPkC%tFWDOmFADKl>y-mr{qy&~wk|p&ZeY!;eXLl|D^+ z)fi%}7R0!&P~v!3D0w_MOx#Rf)-yLNb?Bv0#-KMee?EwMov{kEbG-w9z3m&EJJxe( z#gO`wFSqwjwaJmpC8~kv*D{}Uh33BqqBe@LTb{r7g%CfGI4NuCnfCsLwzlVQwo6*- zo1T}<cqyFyjP>1mP}0(8Rm_nR%U4<uW4Z^E?@E#E(T;)SbKT+cF*#bEQsDu;ll1aO z6wB9D-w()<Lk<J+1<X18*YnxV(CmJCFKLAnR4;E78!dj!I;VH=Sn+S)^bScYo~1EV zpB%}3Pp`OUJvT>w&~v|5UL7lPJV|vF&inQJbjN}DXXNnWn|{6Yt%|wfu~Cm$E5{>y zZ|vIh!jdFwg?B`~Hh02Zv*51oTck+w9Qi~!c+K*S?W>1*Jb^#mdhXM1Eq8&fH`XKV z|Lql>lRmWlXmp<PKb)bP^`}JBPpjI(MO9n;JP^%1wOM%^$pdx>OvBl5PV_etyU{UV z4?4MYO=pzV4s0~PSNs~f1>5R#FM8!@_FWy_VCS4|Q+=q<CjXuMJnr+G;)9pxa_Ba` z-!rw?#5dIV#%ide`y|%fPUvn!J7wzUx=l9c<C_yNG&L7qy8YUn%hl`1A4&YoH51on z6W<8Li|d+;I=YcR`+hYa%nvJkFikFJ6Q5c`J~Y6lIbVR^4~QDTZNsx-4c&r`zC_K_ zhx%-Ljr$|>*90Hezp3>5qPA|q7Jbbc>a$nxF~M&@w_u|$8-by+Yc9a9b)M5aJDRPX zc(nHfpYOqn_M+hr|81zz%tb{@UbB3+_?%6Aw7dL!0rs;V=efmqvup7K<~lbp7c*FE zdqi#EkD4{O*u<x{R|(Jl>g2mMulAgKT|>XM#-X!#RIo))ewdoMZoxJbeeoB6==Pl8 zyV*|7bnQM{$a6dY>^+-bdR06Zz0K#ED}2AUa0~1h@!jmTb@MvlwUbZR#8>pCAK|s@ zR}OT)XU%toYkI$o`(=%41bf8hd+E0Km_IzTBJ>d(XW}3Bed(|oE1grKsVg4r*Ti`0 z?HZhXx94JiTW2b1Zb5q#YyC^;=D)$wAGY=w^ttETq1(k4b>K{c4}$N_R<y(v*!K%A z<-ql@n_bQ4p4VhMYIwbRtqI-s9-GU6y-UPc>?3Zrd#z!vX}&$#A|Lqhq2_mtuQPab zL5vl>qNgvJephRzIvQt-e7uIrndbVAQ4Jr6aiYgwzFM2VezwR7-$xv4&Dvv&KVhC9 z7GuENiFU$dH}AQ~SKUMF2%5!Sx+31Ah9mgRkyz_&X~uJrySfMeE$p$c#dENm-eV$1 zvpv|aY}PtoZw+8S@n5m2R`6S~&ffU9)>@-};2a$>&r-48o8M!NGONddKaB6)RYgx> V-!C7me!q3U<-nE$TMpE7;2(}gBX$4) literal 0 HcmV?d00001 diff --git a/docs/intro/1_intro.md b/guide/intro/1_intro.md similarity index 82% rename from docs/intro/1_intro.md rename to guide/intro/1_intro.md index 68f4e61..08fe347 100644 --- a/docs/intro/1_intro.md +++ b/guide/intro/1_intro.md @@ -34,10 +34,8 @@ vagy a KSZK Újonc weboldala. Ha bármi kérdésed merülne fel a doksi olvasása vagy az elÅ‘adás során nyugodtan keress meg -- Emailben: rafael.laszlo [kukac] kszk.bme.hu -- [Facebookon](https://www.facebook.com/rlacko58/) -- [Githubon](https://github.com/rlacko58) +- Emailben: laszlo.rafael [kukac] kszk.bme.hu -<div style="text-align:center"><img src="intro/img/me.jpg" alt="Kép magamról" /></div> +<div style="text-align:center"><img src="guide/intro/img/me.jpg" alt="Kép magamról" /></div> -[KövetkezÅ‘](intro/2_versioning?id=verziókezelés) +Forrás: [Pro Git könyv](https://git-scm.com/book/en/v2/) diff --git a/docs/intro/2_versioning.md b/guide/intro/2_versioning.md similarity index 97% rename from docs/intro/2_versioning.md rename to guide/intro/2_versioning.md index 2c23a32..b106ab8 100644 --- a/docs/intro/2_versioning.md +++ b/guide/intro/2_versioning.md @@ -93,6 +93,3 @@ Csak megjegyzem, de akár a módosÃtásokat Emailben is ellehet küldeni és a szoftver automatikusan megcsinálja a többi a mi részünkön. <div style="text-align:center"><img src="intro/img/vcstype_distributed.png" alt="Distributed Version Control Systems" /></div> - -[ElÅ‘zÅ‘](intro/1_intro?id=intro) | -[KövetkezÅ‘](intro/3_history?id=git-története) diff --git a/docs/intro/3_history.md b/guide/intro/3_history.md similarity index 91% rename from docs/intro/3_history.md rename to guide/intro/3_history.md index 61db2aa..64f23a1 100644 --- a/docs/intro/3_history.md +++ b/guide/intro/3_history.md @@ -30,6 +30,3 @@ Ekkoriban Ãgy hát megÃrta a [Git-et](https://en.wikipedia.org/wiki/Git), mely a mai napig a legelterjedtebb, leggyorsabb és legkényelmesebb verzió kezelÅ‘ rendszerünk. - -[ElÅ‘zÅ‘](intro/2_versioning?id=verziókezelés) | -[KövetkezÅ‘](workshop/1_installation?id=telepÃtés-és-konfiguráció) diff --git a/docs/intro/img/me.jpg b/guide/intro/img/me.jpg similarity index 100% rename from docs/intro/img/me.jpg rename to guide/intro/img/me.jpg diff --git a/docs/intro/img/vcstype_central.png b/guide/intro/img/vcstype_central.png similarity index 100% rename from docs/intro/img/vcstype_central.png rename to guide/intro/img/vcstype_central.png diff --git a/docs/intro/img/vcstype_distributed.png b/guide/intro/img/vcstype_distributed.png similarity index 100% rename from docs/intro/img/vcstype_distributed.png rename to guide/intro/img/vcstype_distributed.png diff --git a/docs/intro/img/vcstype_local.png b/guide/intro/img/vcstype_local.png similarity index 100% rename from docs/intro/img/vcstype_local.png rename to guide/intro/img/vcstype_local.png diff --git a/docs/remote/1_basics.md b/guide/remote/1_basics.md similarity index 98% rename from docs/remote/1_basics.md rename to guide/remote/1_basics.md index e7a97a4..f9fc455 100644 --- a/docs/remote/1_basics.md +++ b/guide/remote/1_basics.md @@ -119,5 +119,3 @@ Végezetül a publikus kulcsot feltöltjük például githubra A publikus kulcs helye: `~/ssh/id_rsa.pub` Forrás: [docs.github.com](https://docs.github.com/en/free-pro-team@latest/github/authenticating-to-github/generating-a-new-ssh-key-and-adding-it-to-the-ssh-agent) - -[ElÅ‘zÅ‘](workshop/3_branch?id=branch-ek-elágazás) diff --git a/docs/workshop/1_installation.md b/guide/workshop/1_installation.md similarity index 97% rename from docs/workshop/1_installation.md rename to guide/workshop/1_installation.md index c7ab7e3..51c1a68 100644 --- a/docs/workshop/1_installation.md +++ b/guide/workshop/1_installation.md @@ -131,6 +131,3 @@ Ha pedig csak egy adottat szeretnénk: $ git config user.name Rafael László ``` - -[ElÅ‘zÅ‘](intro/3_history?id=git-története) | -[KövetkezÅ‘](workshop/2_basics?id=alapok) diff --git a/docs/workshop/2_basics.md b/guide/workshop/2_basics.md similarity index 99% rename from docs/workshop/2_basics.md rename to guide/workshop/2_basics.md index 0815140..ba9ac85 100644 --- a/docs/workshop/2_basics.md +++ b/guide/workshop/2_basics.md @@ -485,6 +485,3 @@ Máris csak a lényeget látjuk. Az is látható, hogy csak 7 karaktert kaptunk a hashbÅ‘l. Elég csak pár karakter, hogy beazonosÃtsunk például egy commitot a hash-ével. - -[ElÅ‘zÅ‘](workshop/1_installation?id=telepÃtés-és-konfiguráció) | -[KövetkezÅ‘](workshop/3_branch?id=branch-ek-elágazás) diff --git a/docs/workshop/3_branch.md b/guide/workshop/3_branch.md similarity index 99% rename from docs/workshop/3_branch.md rename to guide/workshop/3_branch.md index e3d0210..2c9dbaf 100644 --- a/docs/workshop/3_branch.md +++ b/guide/workshop/3_branch.md @@ -473,6 +473,3 @@ Nem elképesztÅ‘? InnentÅ‘l már csak együtt kell dolgozni, margeknél a konfli megoldani. Semmi extra effortot nem fog igényelni egy hasonló elvégzése. - -[ElÅ‘zÅ‘](workshop/2_basics?id=alapok) | -[KövetkezÅ‘](remote/1_basics?id=alapok-és-ssh-kulcs) diff --git a/docs/workshop/img/.gitkeep b/guide/workshop/img/.gitkeep similarity index 100% rename from docs/workshop/img/.gitkeep rename to guide/workshop/img/.gitkeep diff --git a/docs/workshop/img/basic-branching.png b/guide/workshop/img/basic-branching.png similarity index 100% rename from docs/workshop/img/basic-branching.png rename to guide/workshop/img/basic-branching.png diff --git a/docs/workshop/img/commit-and-tree.png b/guide/workshop/img/commit-and-tree.png similarity index 100% rename from docs/workshop/img/commit-and-tree.png rename to guide/workshop/img/commit-and-tree.png diff --git a/docs/workshop/img/commits-and-parents.png b/guide/workshop/img/commits-and-parents.png similarity index 100% rename from docs/workshop/img/commits-and-parents.png rename to guide/workshop/img/commits-and-parents.png diff --git a/docs/workshop/img/git_lifecycle.png b/guide/workshop/img/git_lifecycle.png similarity index 100% rename from docs/workshop/img/git_lifecycle.png rename to guide/workshop/img/git_lifecycle.png diff --git a/docs/workshop/img/tree_awesome.png b/guide/workshop/img/tree_awesome.png similarity index 100% rename from docs/workshop/img/tree_awesome.png rename to guide/workshop/img/tree_awesome.png diff --git a/docs/workshop/img/tree_with_one_branch.png b/guide/workshop/img/tree_with_one_branch.png similarity index 100% rename from docs/workshop/img/tree_with_one_branch.png rename to guide/workshop/img/tree_with_one_branch.png diff --git a/index.html b/index.html new file mode 100644 index 0000000..52f947c --- /dev/null +++ b/index.html @@ -0,0 +1,95 @@ +<!DOCTYPE html> +<html> + <head> + <meta charset="utf-8" /> + <meta name="theme-color" content="#2f3136" /> + <meta name="msapplication-navbutton-color" content="#2f3136" /> + <meta name="apple-mobile-web-app-capable" content="yes" /> + <meta name="apple-mobile-web-app-status-bar-style" content="#2f3136" /> + <meta + name="viewport" + content="width=device-width, initial-scale=1, shrink-to-fit=no" + /> + <meta + http-equiv="Cache-Control" + content="no-cache, no-store, must-revalidate" + /> + <meta http-equiv="Pragma" content="no-cache" /> + <meta http-equiv="Expires" content="0" /> + <title>My Docs</title> + <link rel="icon" type="image/x-icon" href="favicon.ico" /> + <link rel="stylesheet" href="https://unpkg.com/docute@4/dist/docute.css" /> + <link rel="stylesheet" href="style.css" /> + </head> + + <body> + <div id="docute"></div> + <script src="https://unpkg.com/docute@4/dist/docute.js"></script> + <script> + new Docute({ + target: '#docute', + title: 'Git', + layout: 'wide', + darkThemeToggler: true, + detectSystemDarkTheme: true, + highlight: ['bash'], + nav: [ + { + title: 'FÅ‘oldal', + link: '/', + }, + { + title: 'GitSCH', + link: 'https://git.sch.bme.hu/rlacko/git-presentation', + }, + ], + sidebar: [ + { + title: 'BevezetÅ‘', // Hack + children: [ + { + title: 'Intro', + link: '/guide/intro/1_intro', + }, + { + title: 'Verziókezelés', + link: '/guide/intro/2_versioning', + }, + { + title: 'Git története', + link: '/guide/intro/3_history', + }, + ], + }, + { + title: 'Git használata', + children: [ + { + title: 'TelepÃtés és konfiguráció', + link: '/guide/workshop/1_installation', + }, + { + title: 'Alapok', + link: '/guide/workshop/2_basics', + }, + { + title: 'Branch-ek, elágazás', + link: '/guide/workshop/3_branch', + }, + ], + }, + { + title: 'Távoli Repository', + children: [ + { + title: 'Alapok és SSH kulcs', + link: '/guide/remote/1_basics', + }, + ], + }, + ], + fetchOptions: { cache: 'no-cache' }, + }); + </script> + </body> +</html> diff --git a/package-lock.json b/package-lock.json new file mode 100644 index 0000000..0a11563 --- /dev/null +++ b/package-lock.json @@ -0,0 +1,303 @@ +{ + "name": "python-presentation", + "version": "1.0.0", + "lockfileVersion": 1, + "requires": true, + "dependencies": { + "anymatch": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.1.tgz", + "integrity": "sha512-mM8522psRCqzV+6LhomX5wgp25YVibjh8Wj23I5RPkPppSVSjyKD2A2mBJmWGa+KN7f2D6LNh9jkBCeyLktzjg==", + "requires": { + "normalize-path": "^3.0.0", + "picomatch": "^2.0.4" + } + }, + "binary-extensions": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz", + "integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==" + }, + "braces": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz", + "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==", + "requires": { + "fill-range": "^7.0.1" + } + }, + "chokidar": { + "version": "3.5.1", + "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.1.tgz", + "integrity": "sha512-9+s+Od+W0VJJzawDma/gvBNQqkTiqYTWLuZoyAsivsI4AaWTCzHG06/TMjsf1cYe9Cb97UCEhjz7HvnPk2p/tw==", + "requires": { + "anymatch": "~3.1.1", + "braces": "~3.0.2", + "fsevents": "~2.3.1", + "glob-parent": "~5.1.0", + "is-binary-path": "~2.1.0", + "is-glob": "~4.0.1", + "normalize-path": "~3.0.0", + "readdirp": "~3.5.0" + } + }, + "dateformat": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/dateformat/-/dateformat-2.2.0.tgz", + "integrity": "sha1-QGXiATz5+5Ft39gu+1Bq1MZ2kGI=" + }, + "debug-log": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/debug-log/-/debug-log-1.0.1.tgz", + "integrity": "sha1-IwdjLUwEOCuN+KMvcLiVBG1SdF8=" + }, + "escape-string-regexp": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", + "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=" + }, + "extend": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz", + "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==" + }, + "fill-range": { + "version": "7.0.1", + "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", + "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==", + "requires": { + "to-regex-range": "^5.0.1" + } + }, + "fsevents": { + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz", + "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==", + "optional": true + }, + "furmat": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/furmat/-/furmat-1.0.0.tgz", + "integrity": "sha1-2f5ko+tjvhVut7cbh7hjbagpBMg=", + "requires": { + "chalk": "^1.1.3" + }, + "dependencies": { + "ansi-regex": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz", + "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=" + }, + "ansi-styles": { + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz", + "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=" + }, + "chalk": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz", + "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=", + "requires": { + "ansi-styles": "^2.2.1", + "escape-string-regexp": "^1.0.2", + "has-ansi": "^2.0.0", + "strip-ansi": "^3.0.0", + "supports-color": "^2.0.0" + } + }, + "strip-ansi": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", + "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", + "requires": { + "ansi-regex": "^2.0.0" + } + }, + "supports-color": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz", + "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=" + } + } + }, + "glob-parent": { + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.1.tgz", + "integrity": "sha512-FnI+VGOpnlGHWZxthPGR+QhR78fuiK0sNLkHQv+bL9fQi57lNNdquIbna/WrfROrolq8GK5Ek6BiMwqL/voRYQ==", + "requires": { + "is-glob": "^4.0.1" + } + }, + "has-ansi": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz", + "integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=", + "requires": { + "ansi-regex": "^2.0.0" + }, + "dependencies": { + "ansi-regex": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz", + "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=" + } + } + }, + "is-binary-path": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz", + "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==", + "requires": { + "binary-extensions": "^2.0.0" + } + }, + "is-extglob": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", + "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=" + }, + "is-glob": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.1.tgz", + "integrity": "sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==", + "requires": { + "is-extglob": "^2.1.1" + } + }, + "is-number": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", + "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==" + }, + "normalize-path": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz", + "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==" + }, + "oh-my-log": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/oh-my-log/-/oh-my-log-5.0.1.tgz", + "integrity": "sha1-AMEFPCIFCjBDJ011TxS0Crr7sPY=", + "requires": { + "chalk": "^1.1.3", + "dateformat": "^2.0.0", + "debug-log": "^1.0.1", + "extend": "^3.0.0", + "furmat": "^1.0.0" + }, + "dependencies": { + "ansi-regex": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz", + "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=" + }, + "ansi-styles": { + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz", + "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=" + }, + "chalk": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz", + "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=", + "requires": { + "ansi-styles": "^2.2.1", + "escape-string-regexp": "^1.0.2", + "has-ansi": "^2.0.0", + "strip-ansi": "^3.0.0", + "supports-color": "^2.0.0" + } + }, + "strip-ansi": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", + "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", + "requires": { + "ansi-regex": "^2.0.0" + } + }, + "supports-color": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz", + "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=" + } + } + }, + "picomatch": { + "version": "2.2.2", + "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.2.2.tgz", + "integrity": "sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg==" + }, + "readdirp": { + "version": "3.5.0", + "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.5.0.tgz", + "integrity": "sha512-cMhu7c/8rdhkHXWsY+osBhfSy0JikwpHK/5+imo+LpeasTF8ouErHrlYkwT0++njiyuDvc7OFY5T3ukvZ8qmFQ==", + "requires": { + "picomatch": "^2.2.1" + } + }, + "serve-reload-replace": { + "version": "1.1.7", + "resolved": "https://registry.npmjs.org/serve-reload-replace/-/serve-reload-replace-1.1.7.tgz", + "integrity": "sha512-2l1y7zkbEWRXgEps9xCRuORdwshvlh9UD76P16qgD3LkgLq2gXfqKHJeQS4PnLXDJZA64uxGD4NMZPeYlFcF9A==", + "requires": { + "chalk": "^4.1.0", + "chokidar": "^3.4.3", + "oh-my-log": "^5.0.1" + }, + "dependencies": { + "ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "requires": { + "color-convert": "^2.0.1" + } + }, + "chalk": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz", + "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==", + "requires": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + } + }, + "color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "requires": { + "color-name": "~1.1.4" + } + }, + "color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" + }, + "has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==" + }, + "supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "requires": { + "has-flag": "^4.0.0" + } + } + } + }, + "to-regex-range": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", + "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==", + "requires": { + "is-number": "^7.0.0" + } + } + } +} diff --git a/package.json b/package.json new file mode 100644 index 0000000..8e0211f --- /dev/null +++ b/package.json @@ -0,0 +1,13 @@ +{ + "name": "python-presentation", + "version": "1.0.0", + "description": "2021-es Python dokumentáció KSZK elÅ‘adáshoz", + "scripts": { + "start": "srr" + }, + "author": "", + "license": "GPL", + "dependencies": { + "serve-reload-replace": "^1.1.7" + } +} diff --git a/style.css b/style.css new file mode 100644 index 0000000..a5e5fb1 --- /dev/null +++ b/style.css @@ -0,0 +1,12 @@ +.pre-wrapper { + margin-bottom: 20px !important; + margin-top: 20px !important; +} + +.markdown-header { + margin-top: 80px !important; +} + +ul { + margin-top: 0 !important; +} -- GitLab