Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
git-seminar
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Deploy
Releases
Package registry
Model registry
Operate
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Maximilian Konzack
git-seminar
Commits
2eb505d7
Unverified
Commit
2eb505d7
authored
7 years ago
by
ck85nori
Browse files
Options
Downloads
Patches
Plain Diff
adds rebase vs cherry-pick diagram
parent
2e4a3343
Branches
Branches containing commit
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
dia/rebase-vs-cherry-pick.dia
+684
-0
684 additions, 0 deletions
dia/rebase-vs-cherry-pick.dia
with
684 additions
and
0 deletions
dia/rebase-vs-cherry-pick.dia
0 → 100644
+
684
−
0
View file @
2eb505d7
<?xml version="1.0" encoding="UTF-8"?>
<dia:diagram
xmlns:dia=
"http://www.lysator.liu.se/~alla/dia/"
>
<dia:diagramdata>
<dia:attribute
name=
"background"
>
<dia:color
val=
"#ffffff"
/>
</dia:attribute>
<dia:attribute
name=
"pagebreak"
>
<dia:color
val=
"#000099"
/>
</dia:attribute>
<dia:attribute
name=
"paper"
>
<dia:composite
type=
"paper"
>
<dia:attribute
name=
"name"
>
<dia:string>
#A4#
</dia:string>
</dia:attribute>
<dia:attribute
name=
"tmargin"
>
<dia:real
val=
"2.8222000598907471"
/>
</dia:attribute>
<dia:attribute
name=
"bmargin"
>
<dia:real
val=
"2.8222000598907471"
/>
</dia:attribute>
<dia:attribute
name=
"lmargin"
>
<dia:real
val=
"2.8222000598907471"
/>
</dia:attribute>
<dia:attribute
name=
"rmargin"
>
<dia:real
val=
"2.8222000598907471"
/>
</dia:attribute>
<dia:attribute
name=
"is_portrait"
>
<dia:boolean
val=
"true"
/>
</dia:attribute>
<dia:attribute
name=
"scaling"
>
<dia:real
val=
"1"
/>
</dia:attribute>
<dia:attribute
name=
"fitto"
>
<dia:boolean
val=
"false"
/>
</dia:attribute>
</dia:composite>
</dia:attribute>
<dia:attribute
name=
"grid"
>
<dia:composite
type=
"grid"
>
<dia:attribute
name=
"width_x"
>
<dia:real
val=
"1"
/>
</dia:attribute>
<dia:attribute
name=
"width_y"
>
<dia:real
val=
"1"
/>
</dia:attribute>
<dia:attribute
name=
"visible_x"
>
<dia:int
val=
"1"
/>
</dia:attribute>
<dia:attribute
name=
"visible_y"
>
<dia:int
val=
"1"
/>
</dia:attribute>
<dia:composite
type=
"color"
/>
</dia:composite>
</dia:attribute>
<dia:attribute
name=
"color"
>
<dia:color
val=
"#d8e5e5"
/>
</dia:attribute>
<dia:attribute
name=
"guides"
>
<dia:composite
type=
"guides"
>
<dia:attribute
name=
"hguides"
/>
<dia:attribute
name=
"vguides"
/>
</dia:composite>
</dia:attribute>
</dia:diagramdata>
<dia:layer
name=
"Background"
visible=
"true"
active=
"true"
>
<dia:object
type=
"Flowchart - Ellipse"
version=
"0"
id=
"O0"
>
<dia:attribute
name=
"obj_pos"
>
<dia:point
val=
"25,9"
/>
</dia:attribute>
<dia:attribute
name=
"obj_bb"
>
<dia:rectangle
val=
"24.975,8.975;35.025,27.8691"
/>
</dia:attribute>
<dia:attribute
name=
"elem_corner"
>
<dia:point
val=
"25,9"
/>
</dia:attribute>
<dia:attribute
name=
"elem_width"
>
<dia:real
val=
"10"
/>
</dia:attribute>
<dia:attribute
name=
"elem_height"
>
<dia:real
val=
"18.84412366670734"
/>
</dia:attribute>
<dia:attribute
name=
"border_width"
>
<dia:real
val=
"0.050000000000000003"
/>
</dia:attribute>
<dia:attribute
name=
"show_background"
>
<dia:boolean
val=
"true"
/>
</dia:attribute>
<dia:attribute
name=
"padding"
>
<dia:real
val=
"0.35355339059327379"
/>
</dia:attribute>
<dia:attribute
name=
"text"
>
<dia:composite
type=
"text"
>
<dia:attribute
name=
"string"
>
<dia:string>
##
</dia:string>
</dia:attribute>
<dia:attribute
name=
"font"
>
<dia:font
family=
"sans"
style=
"0"
name=
"Helvetica"
/>
</dia:attribute>
<dia:attribute
name=
"height"
>
<dia:real
val=
"0.80000000000000004"
/>
</dia:attribute>
<dia:attribute
name=
"pos"
>
<dia:point
val=
"30,18.6171"
/>
</dia:attribute>
<dia:attribute
name=
"color"
>
<dia:color
val=
"#000000"
/>
</dia:attribute>
<dia:attribute
name=
"alignment"
>
<dia:enum
val=
"1"
/>
</dia:attribute>
</dia:composite>
</dia:attribute>
</dia:object>
<dia:object
type=
"Standard - Line"
version=
"0"
id=
"O1"
>
<dia:attribute
name=
"obj_pos"
>
<dia:point
val=
"33,15"
/>
</dia:attribute>
<dia:attribute
name=
"obj_bb"
>
<dia:rectangle
val=
"32.975,14.975;33.025,28.025"
/>
</dia:attribute>
<dia:attribute
name=
"conn_endpoints"
>
<dia:point
val=
"33,15"
/>
<dia:point
val=
"33,28"
/>
</dia:attribute>
<dia:attribute
name=
"numcp"
>
<dia:int
val=
"1"
/>
</dia:attribute>
<dia:attribute
name=
"line_width"
>
<dia:real
val=
"0.050000000000000003"
/>
</dia:attribute>
</dia:object>
<dia:object
type=
"Standard - Line"
version=
"0"
id=
"O2"
>
<dia:attribute
name=
"obj_pos"
>
<dia:point
val=
"28,13"
/>
</dia:attribute>
<dia:attribute
name=
"obj_bb"
>
<dia:rectangle
val=
"27.9675,12.9675;33.0325,15.0325"
/>
</dia:attribute>
<dia:attribute
name=
"conn_endpoints"
>
<dia:point
val=
"28,13"
/>
<dia:point
val=
"33,15"
/>
</dia:attribute>
<dia:attribute
name=
"numcp"
>
<dia:int
val=
"1"
/>
</dia:attribute>
<dia:attribute
name=
"line_width"
>
<dia:real
val=
"0.050000000000000003"
/>
</dia:attribute>
<dia:attribute
name=
"line_style"
>
<dia:enum
val=
"1"
/>
</dia:attribute>
</dia:object>
<dia:object
type=
"Standard - Line"
version=
"0"
id=
"O3"
>
<dia:attribute
name=
"obj_pos"
>
<dia:point
val=
"38,15"
/>
</dia:attribute>
<dia:attribute
name=
"obj_bb"
>
<dia:rectangle
val=
"37.975,14.975;38.025,25.025"
/>
</dia:attribute>
<dia:attribute
name=
"conn_endpoints"
>
<dia:point
val=
"38,15"
/>
<dia:point
val=
"38,25"
/>
</dia:attribute>
<dia:attribute
name=
"numcp"
>
<dia:int
val=
"1"
/>
</dia:attribute>
<dia:attribute
name=
"line_width"
>
<dia:real
val=
"0.050000000000000003"
/>
</dia:attribute>
</dia:object>
<dia:object
type=
"Standard - Line"
version=
"0"
id=
"O4"
>
<dia:attribute
name=
"obj_pos"
>
<dia:point
val=
"38,25"
/>
</dia:attribute>
<dia:attribute
name=
"obj_bb"
>
<dia:rectangle
val=
"32.9675,24.9675;38.0325,27.0325"
/>
</dia:attribute>
<dia:attribute
name=
"conn_endpoints"
>
<dia:point
val=
"38,25"
/>
<dia:point
val=
"33,27"
/>
</dia:attribute>
<dia:attribute
name=
"numcp"
>
<dia:int
val=
"1"
/>
</dia:attribute>
<dia:attribute
name=
"line_width"
>
<dia:real
val=
"0.050000000000000003"
/>
</dia:attribute>
<dia:attribute
name=
"line_style"
>
<dia:enum
val=
"1"
/>
</dia:attribute>
</dia:object>
<dia:object
type=
"Standard - Text"
version=
"1"
id=
"O5"
>
<dia:attribute
name=
"obj_pos"
>
<dia:point
val=
"33,15"
/>
</dia:attribute>
<dia:attribute
name=
"obj_bb"
>
<dia:rectangle
val=
"32.8075,14.2525;33.1925,15"
/>
</dia:attribute>
<dia:attribute
name=
"text"
>
<dia:composite
type=
"text"
>
<dia:attribute
name=
"string"
>
<dia:string>
#a#
</dia:string>
</dia:attribute>
<dia:attribute
name=
"font"
>
<dia:font
family=
"monospace"
style=
"80"
name=
"Courier-Bold"
/>
</dia:attribute>
<dia:attribute
name=
"height"
>
<dia:real
val=
"0.80000000000000004"
/>
</dia:attribute>
<dia:attribute
name=
"pos"
>
<dia:point
val=
"33,14.8475"
/>
</dia:attribute>
<dia:attribute
name=
"color"
>
<dia:color
val=
"#000000"
/>
</dia:attribute>
<dia:attribute
name=
"alignment"
>
<dia:enum
val=
"1"
/>
</dia:attribute>
</dia:composite>
</dia:attribute>
<dia:attribute
name=
"valign"
>
<dia:enum
val=
"1"
/>
</dia:attribute>
</dia:object>
<dia:object
type=
"Standard - Text"
version=
"1"
id=
"O6"
>
<dia:attribute
name=
"obj_pos"
>
<dia:point
val=
"38,15"
/>
</dia:attribute>
<dia:attribute
name=
"obj_bb"
>
<dia:rectangle
val=
"37.8075,14.2525;38.1925,15"
/>
</dia:attribute>
<dia:attribute
name=
"text"
>
<dia:composite
type=
"text"
>
<dia:attribute
name=
"string"
>
<dia:string>
#b#
</dia:string>
</dia:attribute>
<dia:attribute
name=
"font"
>
<dia:font
family=
"monospace"
style=
"80"
name=
"Courier-Bold"
/>
</dia:attribute>
<dia:attribute
name=
"height"
>
<dia:real
val=
"0.80000000000000004"
/>
</dia:attribute>
<dia:attribute
name=
"pos"
>
<dia:point
val=
"38,14.8475"
/>
</dia:attribute>
<dia:attribute
name=
"color"
>
<dia:color
val=
"#000000"
/>
</dia:attribute>
<dia:attribute
name=
"alignment"
>
<dia:enum
val=
"1"
/>
</dia:attribute>
</dia:composite>
</dia:attribute>
<dia:attribute
name=
"valign"
>
<dia:enum
val=
"1"
/>
</dia:attribute>
</dia:object>
<dia:object
type=
"Standard - Arc"
version=
"0"
id=
"O7"
>
<dia:attribute
name=
"obj_pos"
>
<dia:point
val=
"31.9134,9.71721"
/>
</dia:attribute>
<dia:attribute
name=
"obj_bb"
>
<dia:rectangle
val=
"31.8786,8.26928;38.5941,14.0348"
/>
</dia:attribute>
<dia:attribute
name=
"conn_endpoints"
>
<dia:point
val=
"31.9134,9.71721"
/>
<dia:point
val=
"38,14"
/>
</dia:attribute>
<dia:attribute
name=
"curve_distance"
>
<dia:real
val=
"-3.5282114253639856"
/>
</dia:attribute>
<dia:attribute
name=
"line_width"
>
<dia:real
val=
"0.05000000074505806"
/>
</dia:attribute>
<dia:attribute
name=
"end_arrow"
>
<dia:enum
val=
"1"
/>
</dia:attribute>
<dia:attribute
name=
"end_arrow_length"
>
<dia:real
val=
"0.5"
/>
</dia:attribute>
<dia:attribute
name=
"end_arrow_width"
>
<dia:real
val=
"0.5"
/>
</dia:attribute>
<dia:connections>
<dia:connection
handle=
"0"
to=
"O0"
connection=
"3"
/>
</dia:connections>
</dia:object>
<dia:object
type=
"Standard - Text"
version=
"1"
id=
"O8"
>
<dia:attribute
name=
"obj_pos"
>
<dia:point
val=
"33,5"
/>
</dia:attribute>
<dia:attribute
name=
"obj_bb"
>
<dia:rectangle
val=
"30.8137,4.38631;35.2049,6.78988"
/>
</dia:attribute>
<dia:attribute
name=
"text"
>
<dia:composite
type=
"text"
>
<dia:attribute
name=
"string"
>
<dia:string>
#rebase
git rebase b c#
</dia:string>
</dia:attribute>
<dia:attribute
name=
"font"
>
<dia:font
family=
"sans"
style=
"0"
name=
"Helvetica"
/>
</dia:attribute>
<dia:attribute
name=
"height"
>
<dia:real
val=
"0.80000000000000004"
/>
</dia:attribute>
<dia:attribute
name=
"pos"
>
<dia:point
val=
"33,5"
/>
</dia:attribute>
<dia:attribute
name=
"color"
>
<dia:color
val=
"#000000"
/>
</dia:attribute>
<dia:attribute
name=
"alignment"
>
<dia:enum
val=
"1"
/>
</dia:attribute>
</dia:composite>
</dia:attribute>
<dia:attribute
name=
"valign"
>
<dia:enum
val=
"3"
/>
</dia:attribute>
</dia:object>
<dia:object
type=
"Standard - Line"
version=
"0"
id=
"O9"
>
<dia:attribute
name=
"obj_pos"
>
<dia:point
val=
"28,13"
/>
</dia:attribute>
<dia:attribute
name=
"obj_bb"
>
<dia:rectangle
val=
"27.975,10.975;28.025,13.025"
/>
</dia:attribute>
<dia:attribute
name=
"conn_endpoints"
>
<dia:point
val=
"28,13"
/>
<dia:point
val=
"28,11"
/>
</dia:attribute>
<dia:attribute
name=
"numcp"
>
<dia:int
val=
"1"
/>
</dia:attribute>
<dia:attribute
name=
"line_width"
>
<dia:real
val=
"0.050000000000000003"
/>
</dia:attribute>
</dia:object>
<dia:object
type=
"Standard - Text"
version=
"1"
id=
"O10"
>
<dia:attribute
name=
"obj_pos"
>
<dia:point
val=
"28,11"
/>
</dia:attribute>
<dia:attribute
name=
"obj_bb"
>
<dia:rectangle
val=
"27.8075,10.2525;28.1925,11"
/>
</dia:attribute>
<dia:attribute
name=
"text"
>
<dia:composite
type=
"text"
>
<dia:attribute
name=
"string"
>
<dia:string>
#c#
</dia:string>
</dia:attribute>
<dia:attribute
name=
"font"
>
<dia:font
family=
"monospace"
style=
"80"
name=
"Courier-Bold"
/>
</dia:attribute>
<dia:attribute
name=
"height"
>
<dia:real
val=
"0.80000000000000004"
/>
</dia:attribute>
<dia:attribute
name=
"pos"
>
<dia:point
val=
"28,10.8475"
/>
</dia:attribute>
<dia:attribute
name=
"color"
>
<dia:color
val=
"#000000"
/>
</dia:attribute>
<dia:attribute
name=
"alignment"
>
<dia:enum
val=
"1"
/>
</dia:attribute>
</dia:composite>
</dia:attribute>
<dia:attribute
name=
"valign"
>
<dia:enum
val=
"1"
/>
</dia:attribute>
</dia:object>
<dia:object
type=
"Flowchart - Ellipse"
version=
"0"
id=
"O11"
>
<dia:attribute
name=
"obj_pos"
>
<dia:point
val=
"49,9"
/>
</dia:attribute>
<dia:attribute
name=
"obj_bb"
>
<dia:rectangle
val=
"48.975,8.975;53.025,15.025"
/>
</dia:attribute>
<dia:attribute
name=
"elem_corner"
>
<dia:point
val=
"49,9"
/>
</dia:attribute>
<dia:attribute
name=
"elem_width"
>
<dia:real
val=
"4"
/>
</dia:attribute>
<dia:attribute
name=
"elem_height"
>
<dia:real
val=
"6"
/>
</dia:attribute>
<dia:attribute
name=
"border_width"
>
<dia:real
val=
"0.050000000000000003"
/>
</dia:attribute>
<dia:attribute
name=
"show_background"
>
<dia:boolean
val=
"true"
/>
</dia:attribute>
<dia:attribute
name=
"padding"
>
<dia:real
val=
"0.35355339059327379"
/>
</dia:attribute>
<dia:attribute
name=
"text"
>
<dia:composite
type=
"text"
>
<dia:attribute
name=
"string"
>
<dia:string>
##
</dia:string>
</dia:attribute>
<dia:attribute
name=
"font"
>
<dia:font
family=
"sans"
style=
"0"
name=
"Helvetica"
/>
</dia:attribute>
<dia:attribute
name=
"height"
>
<dia:real
val=
"0.80000000000000004"
/>
</dia:attribute>
<dia:attribute
name=
"pos"
>
<dia:point
val=
"51,12.195"
/>
</dia:attribute>
<dia:attribute
name=
"color"
>
<dia:color
val=
"#000000"
/>
</dia:attribute>
<dia:attribute
name=
"alignment"
>
<dia:enum
val=
"1"
/>
</dia:attribute>
</dia:composite>
</dia:attribute>
</dia:object>
<dia:object
type=
"Standard - Line"
version=
"0"
id=
"O12"
>
<dia:attribute
name=
"obj_pos"
>
<dia:point
val=
"56,15"
/>
</dia:attribute>
<dia:attribute
name=
"obj_bb"
>
<dia:rectangle
val=
"55.975,14.975;56.025,28.025"
/>
</dia:attribute>
<dia:attribute
name=
"conn_endpoints"
>
<dia:point
val=
"56,15"
/>
<dia:point
val=
"56,28"
/>
</dia:attribute>
<dia:attribute
name=
"numcp"
>
<dia:int
val=
"1"
/>
</dia:attribute>
<dia:attribute
name=
"line_width"
>
<dia:real
val=
"0.050000000000000003"
/>
</dia:attribute>
</dia:object>
<dia:object
type=
"Standard - Line"
version=
"0"
id=
"O13"
>
<dia:attribute
name=
"obj_pos"
>
<dia:point
val=
"51,13"
/>
</dia:attribute>
<dia:attribute
name=
"obj_bb"
>
<dia:rectangle
val=
"50.9675,12.9675;56.0325,15.0325"
/>
</dia:attribute>
<dia:attribute
name=
"conn_endpoints"
>
<dia:point
val=
"51,13"
/>
<dia:point
val=
"56,15"
/>
</dia:attribute>
<dia:attribute
name=
"numcp"
>
<dia:int
val=
"1"
/>
</dia:attribute>
<dia:attribute
name=
"line_width"
>
<dia:real
val=
"0.050000000000000003"
/>
</dia:attribute>
<dia:attribute
name=
"line_style"
>
<dia:enum
val=
"1"
/>
</dia:attribute>
</dia:object>
<dia:object
type=
"Standard - Line"
version=
"0"
id=
"O14"
>
<dia:attribute
name=
"obj_pos"
>
<dia:point
val=
"61,15"
/>
</dia:attribute>
<dia:attribute
name=
"obj_bb"
>
<dia:rectangle
val=
"60.975,14.975;61.025,25.025"
/>
</dia:attribute>
<dia:attribute
name=
"conn_endpoints"
>
<dia:point
val=
"61,15"
/>
<dia:point
val=
"61,25"
/>
</dia:attribute>
<dia:attribute
name=
"numcp"
>
<dia:int
val=
"1"
/>
</dia:attribute>
<dia:attribute
name=
"line_width"
>
<dia:real
val=
"0.050000000000000003"
/>
</dia:attribute>
</dia:object>
<dia:object
type=
"Standard - Line"
version=
"0"
id=
"O15"
>
<dia:attribute
name=
"obj_pos"
>
<dia:point
val=
"61,25"
/>
</dia:attribute>
<dia:attribute
name=
"obj_bb"
>
<dia:rectangle
val=
"55.9675,24.9675;61.0325,27.0325"
/>
</dia:attribute>
<dia:attribute
name=
"conn_endpoints"
>
<dia:point
val=
"61,25"
/>
<dia:point
val=
"56,27"
/>
</dia:attribute>
<dia:attribute
name=
"numcp"
>
<dia:int
val=
"1"
/>
</dia:attribute>
<dia:attribute
name=
"line_width"
>
<dia:real
val=
"0.050000000000000003"
/>
</dia:attribute>
<dia:attribute
name=
"line_style"
>
<dia:enum
val=
"1"
/>
</dia:attribute>
</dia:object>
<dia:object
type=
"Standard - Text"
version=
"1"
id=
"O16"
>
<dia:attribute
name=
"obj_pos"
>
<dia:point
val=
"56,15"
/>
</dia:attribute>
<dia:attribute
name=
"obj_bb"
>
<dia:rectangle
val=
"55.8075,14.2525;56.1925,15"
/>
</dia:attribute>
<dia:attribute
name=
"text"
>
<dia:composite
type=
"text"
>
<dia:attribute
name=
"string"
>
<dia:string>
#a#
</dia:string>
</dia:attribute>
<dia:attribute
name=
"font"
>
<dia:font
family=
"monospace"
style=
"80"
name=
"Courier-Bold"
/>
</dia:attribute>
<dia:attribute
name=
"height"
>
<dia:real
val=
"0.80000000000000004"
/>
</dia:attribute>
<dia:attribute
name=
"pos"
>
<dia:point
val=
"56,14.8475"
/>
</dia:attribute>
<dia:attribute
name=
"color"
>
<dia:color
val=
"#000000"
/>
</dia:attribute>
<dia:attribute
name=
"alignment"
>
<dia:enum
val=
"1"
/>
</dia:attribute>
</dia:composite>
</dia:attribute>
<dia:attribute
name=
"valign"
>
<dia:enum
val=
"1"
/>
</dia:attribute>
</dia:object>
<dia:object
type=
"Standard - Text"
version=
"1"
id=
"O17"
>
<dia:attribute
name=
"obj_pos"
>
<dia:point
val=
"61,15"
/>
</dia:attribute>
<dia:attribute
name=
"obj_bb"
>
<dia:rectangle
val=
"60.8075,14.2525;61.1925,15"
/>
</dia:attribute>
<dia:attribute
name=
"text"
>
<dia:composite
type=
"text"
>
<dia:attribute
name=
"string"
>
<dia:string>
#b#
</dia:string>
</dia:attribute>
<dia:attribute
name=
"font"
>
<dia:font
family=
"monospace"
style=
"80"
name=
"Courier-Bold"
/>
</dia:attribute>
<dia:attribute
name=
"height"
>
<dia:real
val=
"0.80000000000000004"
/>
</dia:attribute>
<dia:attribute
name=
"pos"
>
<dia:point
val=
"61,14.8475"
/>
</dia:attribute>
<dia:attribute
name=
"color"
>
<dia:color
val=
"#000000"
/>
</dia:attribute>
<dia:attribute
name=
"alignment"
>
<dia:enum
val=
"1"
/>
</dia:attribute>
</dia:composite>
</dia:attribute>
<dia:attribute
name=
"valign"
>
<dia:enum
val=
"1"
/>
</dia:attribute>
</dia:object>
<dia:object
type=
"Standard - Arc"
version=
"0"
id=
"O18"
>
<dia:attribute
name=
"obj_pos"
>
<dia:point
val=
"51.7654,9.22836"
/>
</dia:attribute>
<dia:attribute
name=
"obj_bb"
>
<dia:rectangle
val=
"51.7317,7.83066;61.3464,14.0337"
/>
</dia:attribute>
<dia:attribute
name=
"conn_endpoints"
>
<dia:point
val=
"51.7654,9.22836"
/>
<dia:point
val=
"61,14"
/>
</dia:attribute>
<dia:attribute
name=
"curve_distance"
>
<dia:real
val=
"-3.5282114253639856"
/>
</dia:attribute>
<dia:attribute
name=
"line_width"
>
<dia:real
val=
"0.05000000074505806"
/>
</dia:attribute>
<dia:attribute
name=
"end_arrow"
>
<dia:enum
val=
"1"
/>
</dia:attribute>
<dia:attribute
name=
"end_arrow_length"
>
<dia:real
val=
"0.5"
/>
</dia:attribute>
<dia:attribute
name=
"end_arrow_width"
>
<dia:real
val=
"0.5"
/>
</dia:attribute>
<dia:connections>
<dia:connection
handle=
"0"
to=
"O11"
connection=
"3"
/>
</dia:connections>
</dia:object>
<dia:object
type=
"Standard - Text"
version=
"1"
id=
"O19"
>
<dia:attribute
name=
"obj_pos"
>
<dia:point
val=
"56,5"
/>
</dia:attribute>
<dia:attribute
name=
"obj_bb"
>
<dia:rectangle
val=
"52.9162,4.38631;59.1024,7.58988"
/>
</dia:attribute>
<dia:attribute
name=
"text"
>
<dia:composite
type=
"text"
>
<dia:attribute
name=
"string"
>
<dia:string>
#cherry-pick
git checkout b
git cherry-pick a...c#
</dia:string>
</dia:attribute>
<dia:attribute
name=
"font"
>
<dia:font
family=
"sans"
style=
"0"
name=
"Helvetica"
/>
</dia:attribute>
<dia:attribute
name=
"height"
>
<dia:real
val=
"0.80000000000000004"
/>
</dia:attribute>
<dia:attribute
name=
"pos"
>
<dia:point
val=
"56,5"
/>
</dia:attribute>
<dia:attribute
name=
"color"
>
<dia:color
val=
"#000000"
/>
</dia:attribute>
<dia:attribute
name=
"alignment"
>
<dia:enum
val=
"1"
/>
</dia:attribute>
</dia:composite>
</dia:attribute>
<dia:attribute
name=
"valign"
>
<dia:enum
val=
"3"
/>
</dia:attribute>
</dia:object>
<dia:object
type=
"Standard - Line"
version=
"0"
id=
"O20"
>
<dia:attribute
name=
"obj_pos"
>
<dia:point
val=
"51,13"
/>
</dia:attribute>
<dia:attribute
name=
"obj_bb"
>
<dia:rectangle
val=
"50.975,10.975;51.025,13.025"
/>
</dia:attribute>
<dia:attribute
name=
"conn_endpoints"
>
<dia:point
val=
"51,13"
/>
<dia:point
val=
"51,11"
/>
</dia:attribute>
<dia:attribute
name=
"numcp"
>
<dia:int
val=
"1"
/>
</dia:attribute>
<dia:attribute
name=
"line_width"
>
<dia:real
val=
"0.050000000000000003"
/>
</dia:attribute>
</dia:object>
<dia:object
type=
"Standard - Text"
version=
"1"
id=
"O21"
>
<dia:attribute
name=
"obj_pos"
>
<dia:point
val=
"51,11"
/>
</dia:attribute>
<dia:attribute
name=
"obj_bb"
>
<dia:rectangle
val=
"50.8075,10.2525;51.1925,11"
/>
</dia:attribute>
<dia:attribute
name=
"text"
>
<dia:composite
type=
"text"
>
<dia:attribute
name=
"string"
>
<dia:string>
#c#
</dia:string>
</dia:attribute>
<dia:attribute
name=
"font"
>
<dia:font
family=
"monospace"
style=
"80"
name=
"Courier-Bold"
/>
</dia:attribute>
<dia:attribute
name=
"height"
>
<dia:real
val=
"0.80000000000000004"
/>
</dia:attribute>
<dia:attribute
name=
"pos"
>
<dia:point
val=
"51,10.8475"
/>
</dia:attribute>
<dia:attribute
name=
"color"
>
<dia:color
val=
"#000000"
/>
</dia:attribute>
<dia:attribute
name=
"alignment"
>
<dia:enum
val=
"1"
/>
</dia:attribute>
</dia:composite>
</dia:attribute>
<dia:attribute
name=
"valign"
>
<dia:enum
val=
"1"
/>
</dia:attribute>
</dia:object>
</dia:layer>
</dia:diagram>
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment