|
|
| Строка 1: |
Строка 1: |
| | |
| {{Diagram | | {{Diagram |
| |Description=Git concepts and operation - основные концепции и операции внутри репозитория Git | | |Description=Диаграмма Сообщества "LiderID" |
| http://digida.mgpu.ru/images/diagrams/Diagrams_00611695696e5c6e4b1bbdf8d1ae74da.png
| | |Field_of_knowledge=NetSci, Образование, Сетевое сообщество, Управление |
| |Field_of_knowledge=Информатика | |
| |Environment=Graphviz | | |Environment=Graphviz |
| }} | | }} |
| <graphviz> | | <graphviz> |
| digraph git_basics {
| | digraph { |
| size="8,8" ;
| | node [shape = "hexagon"]; |
| graph [
| | "Администратор мероприятия" [color = blue]; |
| label = "Basic git concepts and operations\n\n"
| | |
| labelloc = t
| | "Участник 1" [color = green] ; |
| fontname = "Helvetica,Arial,sans-serif"
| | "Участник 2" [color = green] ; |
| fontsize = 20
| | "Участник Х" [color = green] ; |
| layout = dot
| | "Участник Y" [color = green] ; |
| rankdir = LR
| | |
| newrank = true
| | "Администратор" -> "Участник 1"; |
| ]
| | "Администратор" -> "Участник 2"; |
| node [
| | "Администратор" -> "Участник Х"; |
| style=filled
| | "Администратор" -> "Участник Y"; |
| shape=rect
| | |
| pencolor="#00000044" // frames color
| | "Участник Х" -> "Тема мероприятия" [label = " создает" decorate=true] ; |
| fontname="Helvetica,Arial,sans-serif"
| | "Участник Y" -> "Группа Z" [label = " создает" decorate=true]; |
| shape=plaintext
| | |
| ]
| | "Тема форума" [color = yellow]; |
| edge [
| | "Группа Z" [color = yellow]; |
| arrowsize=0.5
| | |
| fontname="Helvetica,Arial,sans-serif"
| | "Участник 1" -> "Тема форума" [dir=both label = " включается" decorate=true]; |
| labeldistance=3
| | "Участник 2" -> "Группа Z" [dir=both label = " включается" decorate=true]; |
| labelfontcolor="#00000080"
| | |
| penwidth=2
| | "Тема форума" -> "Участник Х" [label = " обогащается" decorate=true] |
| style=dotted // dotted style symbolizes data transfer
| | "Группа Z" -> "Участник Y" [label = " обогащается" decorate=true] |
| ]
| |
| changes [
| |
| color="#88000022"
| |
| label=<<table border="0" cellborder="1" cellspacing="0" cellpadding="4">
| |
| <tr> <td> <b>changes</b><br/>in the working tree </td> </tr>
| |
| <tr> <td align="left"><i>To view: </i><br align="left"/>
| |
| git diff
| |
| <br align="left"/></td> </tr>
| |
| </table>>
| |
| shape=plain
| |
| ]
| |
| staging [
| |
| fillcolor="#ff880022"
| |
| label=<<table border="0" cellborder="1" cellspacing="0" cellpadding="4">
| |
| <tr> <td> <b>staging area</b><br/>(cache, index)</td> </tr>
| |
| <tr> <td align="left"><i>To view: </i><br align="left"/>
| |
| git diff --staged
| |
| <br align="left"/></td> </tr>
| |
| </table>>
| |
| shape=plain
| |
| ]
| |
| staging -> HEAD:push [label="git commit" weight=1000 color="#88000088"]
| |
| stash [
| |
| fillcolor="#0044ff22"
| |
| label=<<table border="0" cellborder="1" cellspacing="0" cellpadding="4">
| |
| <tr> <td> <b>stash</b></td> </tr>
| |
| <tr> <td align="left"><i>To view:</i><br align="left"/>
| |
| git stash list
| |
| <br align="left"/></td> </tr>
| |
| </table>>
| |
| shape=plain
| |
| ]
| |
| stash_push [
| |
| label="git stash [push]"
| |
| style=""
| |
| shape=plain
| |
| color="#00008844"
| |
| ]
| |
| {
| |
| edge [arrowhead=none color="#00008844"]
| |
| changes -> stash_push
| |
| stash_push -> staging
| |
| }
| |
| changes -> stash [
| |
| dir=back
| |
| xlabel="git stash pop"
| |
| color="#00000088" weight=0]
| |
| stash_push -> stash [xdir=back color="#00008844" minlen=0]
| |
| HEAD [
| |
| fillcolor="#88ff0022"
| |
| label=<<table border="0" cellborder="1" cellspacing="0" cellpadding="3">
| |
| <tr> <td port="push" sides="ltr"> <b>HEAD </b>of</td> </tr>
| |
| <tr> <td port="pull" sides="lbr"> the current branch</td> </tr>
| |
| <tr> <td port="switch" align="left">
| |
| <i>To view:</i>
| |
| <br align="left"/>
| |
| git show<br align="left"/>
| |
| git log
| |
| <br align="left"/>
| |
| </td> </tr>
| |
| <tr> <td align="left">
| |
| <i>To change branch:</i><br align="left"/>
| |
| git switch ...
| |
| <br align="left"/>
| |
| git checkout ...
| |
| <br align="left"/>
| |
| </td> </tr>
| |
| </table>>
| |
| shape=plain
| |
| ]
| |
| remote [
| |
| label="remote branch"
| |
| shape=box
| |
| color="#00000022"
| |
| fillcolor="#00ff0022"
| |
| ]
| |
|
| |
|
| HEAD:push -> remote [label="git push" color="#88000088"]
| |
| HEAD:pull -> remote [dir=back label="git pull" color="#00440088"]
| |
| branches [
| |
| fillcolor="#00888822"
| |
| label=<<table border="0" cellborder="1" cellspacing="0" cellpadding="4">
| |
| <tr> <td> <b>local branches</b> </td> </tr>
| |
| <tr> <td align="left"><i>To view:</i><br align="left"/>
| |
| git branch [--list]
| |
| <br align="left"/></td> </tr>
| |
| </table>>
| |
| shape=plain
| |
| ]
| |
| changes -> staging [label="git add ... \ngit reset " color="#88000088"]
| |
| discard [shape=plaintext style=""]
| |
| changes -> discard [label="git restore ..." color="#88000088"]
| |
| {rank=same changes discard}
| |
| // UML style aggregation
| |
| HEAD:switch -> branches [
| |
| dir=back
| |
| style=""
| |
| penwidth=1
| |
| arrowtail=odiamond
| |
| arrowhead=none
| |
| color="#00000088"
| |
| ]
| |
| } | | } |
|
| |
|
| </graphviz> | | </graphviz> |
|
| |
|
| [[Категория:Diagrams]] | | |
| | См. [[Форум]], [[Блог]] |
| | |
| | [[Category:Diagrams]] |
