mirror of
https://github.com/jesseduffield/lazygit.git
synced 2026-09-24 23:40:03 -05:00
update squash integration test
This commit is contained in:
@@ -14,14 +14,14 @@ myfile3
|
||||
# Please enter the commit message for your changes. Lines starting
|
||||
# with '#' will be ignored, and an empty message aborts the commit.
|
||||
#
|
||||
# Date: Tue Oct 6 21:47:36 2020 +1100
|
||||
# Date: Mon Apr 5 11:49:51 2021 +1000
|
||||
#
|
||||
# interactive rebase in progress; onto 0c6aed6
|
||||
# interactive rebase in progress; onto e11ec0e
|
||||
# Last commands done (4 commands done):
|
||||
# drop 35bf029 myfile4
|
||||
# fixup 51a88ed myfile5
|
||||
# drop 110df01 myfile4
|
||||
# fixup 07cf881 myfile5
|
||||
# No commands remaining.
|
||||
# You are currently rebasing branch 'master' on '0c6aed6'.
|
||||
# You are currently rebasing branch 'master' on 'e11ec0e'.
|
||||
#
|
||||
# Changes to be committed:
|
||||
# new file: myfile2
|
||||
|
||||
@@ -1 +1 @@
|
||||
ac0b81af0c436000141d41d6bfbf61fe41567eca
|
||||
b19c1df5dc3e523e78444cbaa07a81a89f19a4aa
|
||||
|
||||
Binary file not shown.
@@ -1,10 +1,10 @@
|
||||
0000000000000000000000000000000000000000 0c6aed66ccd076086011a0e68bf67e3477cd5e1d CI <CI@example.com> 1601981256 +1100 commit (initial): myfile1
|
||||
0c6aed66ccd076086011a0e68bf67e3477cd5e1d ac0b81af0c436000141d41d6bfbf61fe41567eca CI <CI@example.com> 1601981256 +1100 commit: myfile2
|
||||
ac0b81af0c436000141d41d6bfbf61fe41567eca db27c30903c7fa6564e9c925097a03b88e6b67e7 CI <CI@example.com> 1601981256 +1100 commit: myfile3
|
||||
db27c30903c7fa6564e9c925097a03b88e6b67e7 35bf02987e13a6d711d4279778063e72dd051680 CI <CI@example.com> 1601981256 +1100 commit: myfile4
|
||||
35bf02987e13a6d711d4279778063e72dd051680 51a88edd955132342caad6512e92d25164b5f7d3 CI <CI@example.com> 1601981256 +1100 commit: myfile5
|
||||
51a88edd955132342caad6512e92d25164b5f7d3 0c6aed66ccd076086011a0e68bf67e3477cd5e1d CI <CI@example.com> 1601981258 +1100 rebase -i (start): checkout 0c6aed66ccd076086011a0e68bf67e3477cd5e1d
|
||||
0c6aed66ccd076086011a0e68bf67e3477cd5e1d ac0b81af0c436000141d41d6bfbf61fe41567eca CI <CI@example.com> 1601981258 +1100 rebase -i: fast-forward
|
||||
ac0b81af0c436000141d41d6bfbf61fe41567eca 75afa841946755c424097363ba4e5682951b02e3 CI <CI@example.com> 1601981262 +1100 rebase -i (squash): # This is a combination of 2 commits.
|
||||
75afa841946755c424097363ba4e5682951b02e3 5ef618ee84d1fbb6f277996061996ce5ec0faf4e CI <CI@example.com> 1601981262 +1100 rebase -i (fixup): myfile2
|
||||
5ef618ee84d1fbb6f277996061996ce5ec0faf4e 5ef618ee84d1fbb6f277996061996ce5ec0faf4e CI <CI@example.com> 1601981262 +1100 rebase -i (finish): returning to refs/heads/master
|
||||
0000000000000000000000000000000000000000 e11ec0e7a753a2cc10e348948173064e17d127d6 CI <CI@example.com> 1617587391 +1000 commit (initial): myfile1
|
||||
e11ec0e7a753a2cc10e348948173064e17d127d6 b19c1df5dc3e523e78444cbaa07a81a89f19a4aa CI <CI@example.com> 1617587391 +1000 commit: myfile2
|
||||
b19c1df5dc3e523e78444cbaa07a81a89f19a4aa 20e23116605fc77c1452a0834277e7f1f07c4c22 CI <CI@example.com> 1617587391 +1000 commit: myfile3
|
||||
20e23116605fc77c1452a0834277e7f1f07c4c22 110df011cb4464ac4073580e252abd1148e4d1b3 CI <CI@example.com> 1617587391 +1000 commit: myfile4
|
||||
110df011cb4464ac4073580e252abd1148e4d1b3 07cf881fb6557a9676ff388420433cf375a3565e CI <CI@example.com> 1617587391 +1000 commit: myfile5
|
||||
07cf881fb6557a9676ff388420433cf375a3565e e11ec0e7a753a2cc10e348948173064e17d127d6 CI <CI@example.com> 1617587392 +1000 rebase -i (start): checkout e11ec0e7a753a2cc10e348948173064e17d127d6
|
||||
e11ec0e7a753a2cc10e348948173064e17d127d6 b19c1df5dc3e523e78444cbaa07a81a89f19a4aa CI <CI@example.com> 1617587392 +1000 rebase -i: fast-forward
|
||||
b19c1df5dc3e523e78444cbaa07a81a89f19a4aa 071c49e226b0040e0ecc3494417193357104914d CI <CI@example.com> 1617587395 +1000 rebase -i (squash): # This is a combination of 2 commits.
|
||||
071c49e226b0040e0ecc3494417193357104914d 47e0e1f091e2be405f3e23e75eede4f6e392eda3 CI <CI@example.com> 1617587395 +1000 rebase -i (fixup): myfile2
|
||||
47e0e1f091e2be405f3e23e75eede4f6e392eda3 47e0e1f091e2be405f3e23e75eede4f6e392eda3 CI <CI@example.com> 1617587395 +1000 rebase -i (finish): returning to refs/heads/master
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
0000000000000000000000000000000000000000 0c6aed66ccd076086011a0e68bf67e3477cd5e1d CI <CI@example.com> 1601981256 +1100 commit (initial): myfile1
|
||||
0c6aed66ccd076086011a0e68bf67e3477cd5e1d ac0b81af0c436000141d41d6bfbf61fe41567eca CI <CI@example.com> 1601981256 +1100 commit: myfile2
|
||||
ac0b81af0c436000141d41d6bfbf61fe41567eca db27c30903c7fa6564e9c925097a03b88e6b67e7 CI <CI@example.com> 1601981256 +1100 commit: myfile3
|
||||
db27c30903c7fa6564e9c925097a03b88e6b67e7 35bf02987e13a6d711d4279778063e72dd051680 CI <CI@example.com> 1601981256 +1100 commit: myfile4
|
||||
35bf02987e13a6d711d4279778063e72dd051680 51a88edd955132342caad6512e92d25164b5f7d3 CI <CI@example.com> 1601981256 +1100 commit: myfile5
|
||||
51a88edd955132342caad6512e92d25164b5f7d3 5ef618ee84d1fbb6f277996061996ce5ec0faf4e CI <CI@example.com> 1601981262 +1100 rebase -i (finish): refs/heads/master onto 0c6aed66ccd076086011a0e68bf67e3477cd5e1d
|
||||
0000000000000000000000000000000000000000 e11ec0e7a753a2cc10e348948173064e17d127d6 CI <CI@example.com> 1617587391 +1000 commit (initial): myfile1
|
||||
e11ec0e7a753a2cc10e348948173064e17d127d6 b19c1df5dc3e523e78444cbaa07a81a89f19a4aa CI <CI@example.com> 1617587391 +1000 commit: myfile2
|
||||
b19c1df5dc3e523e78444cbaa07a81a89f19a4aa 20e23116605fc77c1452a0834277e7f1f07c4c22 CI <CI@example.com> 1617587391 +1000 commit: myfile3
|
||||
20e23116605fc77c1452a0834277e7f1f07c4c22 110df011cb4464ac4073580e252abd1148e4d1b3 CI <CI@example.com> 1617587391 +1000 commit: myfile4
|
||||
110df011cb4464ac4073580e252abd1148e4d1b3 07cf881fb6557a9676ff388420433cf375a3565e CI <CI@example.com> 1617587391 +1000 commit: myfile5
|
||||
07cf881fb6557a9676ff388420433cf375a3565e 47e0e1f091e2be405f3e23e75eede4f6e392eda3 CI <CI@example.com> 1617587395 +1000 rebase -i (finish): refs/heads/master onto e11ec0e7a753a2cc10e348948173064e17d127d6
|
||||
|
||||
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
-2
@@ -1,2 +0,0 @@
|
||||
x��K
|
||||
Β0@]ηΩ2“Ι― "tΥcL’ [J½½υnοΑΛkksΧ8ΨSίE4cf²k‘LΖΊ†…sMΑ”RΕ°%JΆ6ήεΩ5ΉTΑ1ϋ‹5a!‚'ω%ΰΠGPόκ�uΧγ¤―γt—7·m‘K^ΫM£"ηυ@τ�κς§®Ϊ§Ξ‹8υτο:'
|
||||
-3
@@ -1,3 +0,0 @@
|
||||
x}ŽA
|
||||
Â0E]çÙ2Ó´“)ˆ]õéÌÆ–Aoo]»{|Þ‡'K)sõ␍„SÝÌ<NXs™U“d±‚fɘ$u1bëÖ´Ù«zJ¦D"
|
||||
‘€ ñ”)ZhcíÕ¥w},›FÆ»}RYŸv‘¥Ü<î§ž±éȟܾîQÕþëÔº+ß<?q÷r=É
|
||||
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
+2
@@ -0,0 +1,2 @@
|
||||
x�ֽA
|
||||
ƒ0@ׁ®s��ֺ��“¥\y�˜L¨א‘��׳#t�yנS5[ֻ¥×€*©`”ֵ�2³R�¨‹T</�gב׃׀¹רn¯zְ4ֳ}��ת‰¶ozKױ@B~¾ ®„ˆמ¬ח₪י���·¬›’�3ה,׳
|
||||
@@ -1 +1 @@
|
||||
5ef618ee84d1fbb6f277996061996ce5ec0faf4e
|
||||
47e0e1f091e2be405f3e23e75eede4f6e392eda3
|
||||
|
||||
@@ -1 +1 @@
|
||||
[{"Timestamp":14,"Event":{"Type":1,"Mod":0,"Key":0,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":0,"Bytes":null}},{"Timestamp":482,"Event":{"Type":0,"Mod":0,"Key":65514,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":3,"Bytes":"G09D"}},{"Timestamp":626,"Event":{"Type":0,"Mod":0,"Key":65514,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":3,"Bytes":"G09D"}},{"Timestamp":810,"Event":{"Type":0,"Mod":0,"Key":65516,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":3,"Bytes":"G09C"}},{"Timestamp":937,"Event":{"Type":0,"Mod":0,"Key":65516,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":3,"Bytes":"G09C"}},{"Timestamp":1065,"Event":{"Type":0,"Mod":0,"Key":65516,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":3,"Bytes":"G09C"}},{"Timestamp":1591,"Event":{"Type":0,"Mod":0,"Key":0,"Ch":101,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"ZQ=="}},{"Timestamp":2034,"Event":{"Type":0,"Mod":0,"Key":65517,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":3,"Bytes":"G09B"}},{"Timestamp":2243,"Event":{"Type":0,"Mod":0,"Key":0,"Ch":115,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"cw=="}},{"Timestamp":2554,"Event":{"Type":0,"Mod":0,"Key":65517,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":3,"Bytes":"G09B"}},{"Timestamp":2803,"Event":{"Type":0,"Mod":0,"Key":0,"Ch":100,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"ZA=="}},{"Timestamp":3209,"Event":{"Type":0,"Mod":0,"Key":65517,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":3,"Bytes":"G09B"}},{"Timestamp":3522,"Event":{"Type":0,"Mod":0,"Key":0,"Ch":102,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"Zg=="}},{"Timestamp":4066,"Event":{"Type":0,"Mod":0,"Key":0,"Ch":109,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"bQ=="}},{"Timestamp":5091,"Event":{"Type":0,"Mod":0,"Key":13,"Ch":0,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"DQ=="}},{"Timestamp":5834,"Event":{"Type":0,"Mod":0,"Key":0,"Ch":113,"Width":0,"Height":0,"Err":null,"MouseX":0,"MouseY":0,"N":1,"Bytes":"cQ=="}}]
|
||||
{"KeyEvents":[{"Timestamp":568,"Mod":0,"Key":259,"Ch":0},{"Timestamp":784,"Mod":0,"Key":259,"Ch":0},{"Timestamp":1056,"Mod":0,"Key":258,"Ch":0},{"Timestamp":1217,"Mod":0,"Key":258,"Ch":0},{"Timestamp":1369,"Mod":0,"Key":258,"Ch":0},{"Timestamp":1592,"Mod":0,"Key":256,"Ch":101},{"Timestamp":2377,"Mod":0,"Key":257,"Ch":0},{"Timestamp":2728,"Mod":0,"Key":256,"Ch":115},{"Timestamp":2905,"Mod":0,"Key":257,"Ch":0},{"Timestamp":3128,"Mod":0,"Key":256,"Ch":100},{"Timestamp":3320,"Mod":0,"Key":257,"Ch":0},{"Timestamp":3552,"Mod":0,"Key":256,"Ch":102},{"Timestamp":4192,"Mod":0,"Key":256,"Ch":109},{"Timestamp":4528,"Mod":0,"Key":13,"Ch":13},{"Timestamp":5320,"Mod":0,"Key":256,"Ch":113}],"ResizeEvents":[{"Timestamp":0,"Width":127,"Height":35}]}
|
||||
Reference in New Issue
Block a user