You cannot select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
79 lines
1.2 KiB
Plaintext
79 lines
1.2 KiB
Plaintext
feature done
|
|
blob
|
|
mark :1
|
|
data 8
|
|
initial
|
|
|
|
reset refs/heads/B
|
|
commit refs/heads/B
|
|
mark :2
|
|
author Little O. Me <me@little.net> 1535228562 -0700
|
|
committer Little O. Me <me@little.net> 1535228562 -0700
|
|
data 9
|
|
Modified
|
|
M 100644 :1 filename
|
|
M 100644 :1 ten
|
|
M 100644 :1 twenty
|
|
|
|
blob
|
|
mark :3
|
|
data 11
|
|
twenty-mod
|
|
|
|
commit refs/heads/B
|
|
mark :4
|
|
author Little 'ol Me <me@laptop.(none)> 1535229544 -0700
|
|
committer Little 'ol Me <me@laptop.(none)> 1535229544 -0700
|
|
data 18
|
|
add the number 20
|
|
from :2
|
|
M 100644 :3 twenty
|
|
|
|
blob
|
|
mark :5
|
|
data 8
|
|
ten-mod
|
|
|
|
commit refs/heads/A
|
|
mark :6
|
|
author Little O. Me <me@machine52.little.net> 1535229523 -0700
|
|
committer Little O. Me <me@machine52.little.net> 1535229523 -0700
|
|
data 8
|
|
add ten
|
|
from :2
|
|
M 100644 :5 ten
|
|
|
|
commit refs/heads/master
|
|
mark :7
|
|
author Lit.e Me <me@fire.com> 1535229559 -0700
|
|
committer Lit.e Me <me@fire.com> 1535229580 -0700
|
|
data 24
|
|
Merge branch 'A' into B
|
|
from :4
|
|
merge :6
|
|
M 100644 :5 ten
|
|
|
|
blob
|
|
mark :8
|
|
data 6
|
|
final
|
|
|
|
commit refs/heads/master
|
|
mark :9
|
|
author Little Me <me@bigcompany.com> 1535229601 -0700
|
|
committer Little Me <me@bigcompany.com> 1535229601 -0700
|
|
data 9
|
|
whatever
|
|
from :7
|
|
M 100644 :8 filename
|
|
M 100644 :8 ten
|
|
M 100644 :8 twenty
|
|
|
|
tag v1.0
|
|
from :9
|
|
tagger Little John <second@merry.men> 1535229618 -0700
|
|
data 15
|
|
version one :)
|
|
|
|
done
|