1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39
|
feature done
blob
mark :1
data 10
keepme v1
reset refs/heads/master
commit refs/heads/master
mark :2
author Full Name <user@organization.tld> 1000040000 +0100
committer Full Name <user@organization.tld> 1000040000 +0100
data 29
E: Merge commit 'D' into 'B'
M 100644 :1 keepme
blob
mark :3
data 10
keepme v2
reset refs/heads/master
commit refs/heads/master
mark :4
author Full Name <user@organization.tld> 1000080000 +0100
committer Full Name <user@organization.tld> 1000080000 +0100
data 2
I
M 100644 :3 keepme
commit refs/heads/master
mark :5
author Full Name <user@organization.tld> 1000090000 +0100
committer Full Name <user@organization.tld> 1000090000 +0100
data 29
J: Merge commit 'I' into 'H'
from :2
merge :4
done
|