diff --git a/test/integration/squash/expected/.git_keep/COMMIT_EDITMSG b/test/integration/squash/expected/.git_keep/COMMIT_EDITMSG
index 01a9c0330..877ad0ddb 100644
--- a/test/integration/squash/expected/.git_keep/COMMIT_EDITMSG
+++ b/test/integration/squash/expected/.git_keep/COMMIT_EDITMSG
@@ -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
diff --git a/test/integration/squash/expected/.git_keep/ORIG_HEAD b/test/integration/squash/expected/.git_keep/ORIG_HEAD
index 93c77382b..cbe313f37 100644
--- a/test/integration/squash/expected/.git_keep/ORIG_HEAD
+++ b/test/integration/squash/expected/.git_keep/ORIG_HEAD
@@ -1 +1 @@
-ac0b81af0c436000141d41d6bfbf61fe41567eca
+b19c1df5dc3e523e78444cbaa07a81a89f19a4aa
diff --git a/test/integration/squash/expected/.git_keep/index b/test/integration/squash/expected/.git_keep/index
index c94c1469c..d085b3efb 100644
Binary files a/test/integration/squash/expected/.git_keep/index and b/test/integration/squash/expected/.git_keep/index differ
diff --git a/test/integration/squash/expected/.git_keep/logs/HEAD b/test/integration/squash/expected/.git_keep/logs/HEAD
index 7d1bab2af..f43c62dc8 100644
--- a/test/integration/squash/expected/.git_keep/logs/HEAD
+++ b/test/integration/squash/expected/.git_keep/logs/HEAD
@@ -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
diff --git a/test/integration/squash/expected/.git_keep/logs/refs/heads/master b/test/integration/squash/expected/.git_keep/logs/refs/heads/master
index adbf39bb5..ef591b30e 100644
--- a/test/integration/squash/expected/.git_keep/logs/refs/heads/master
+++ b/test/integration/squash/expected/.git_keep/logs/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
diff --git a/test/integration/squash/expected/.git_keep/objects/07/1c49e226b0040e0ecc3494417193357104914d b/test/integration/squash/expected/.git_keep/objects/07/1c49e226b0040e0ecc3494417193357104914d
new file mode 100644
index 000000000..bf6740609
Binary files /dev/null and b/test/integration/squash/expected/.git_keep/objects/07/1c49e226b0040e0ecc3494417193357104914d differ
diff --git a/test/integration/squash/expected/.git_keep/objects/07/cf881fb6557a9676ff388420433cf375a3565e b/test/integration/squash/expected/.git_keep/objects/07/cf881fb6557a9676ff388420433cf375a3565e
new file mode 100644
index 000000000..462faf5e8
Binary files /dev/null and b/test/integration/squash/expected/.git_keep/objects/07/cf881fb6557a9676ff388420433cf375a3565e differ
diff --git a/test/integration/squash/expected/.git_keep/objects/0c/6aed66ccd076086011a0e68bf67e3477cd5e1d b/test/integration/squash/expected/.git_keep/objects/0c/6aed66ccd076086011a0e68bf67e3477cd5e1d
deleted file mode 100644
index 16d75b6d3..000000000
Binary files a/test/integration/squash/expected/.git_keep/objects/0c/6aed66ccd076086011a0e68bf67e3477cd5e1d and /dev/null differ
diff --git a/test/integration/squash/expected/.git_keep/objects/11/0df011cb4464ac4073580e252abd1148e4d1b3 b/test/integration/squash/expected/.git_keep/objects/11/0df011cb4464ac4073580e252abd1148e4d1b3
new file mode 100644
index 000000000..ca50ff20f
Binary files /dev/null and b/test/integration/squash/expected/.git_keep/objects/11/0df011cb4464ac4073580e252abd1148e4d1b3 differ
diff --git a/test/integration/squash/expected/.git_keep/objects/20/e23116605fc77c1452a0834277e7f1f07c4c22 b/test/integration/squash/expected/.git_keep/objects/20/e23116605fc77c1452a0834277e7f1f07c4c22
new file mode 100644
index 000000000..aadb70531
Binary files /dev/null and b/test/integration/squash/expected/.git_keep/objects/20/e23116605fc77c1452a0834277e7f1f07c4c22 differ
diff --git a/test/integration/squash/expected/.git_keep/objects/35/bf02987e13a6d711d4279778063e72dd051680 b/test/integration/squash/expected/.git_keep/objects/35/bf02987e13a6d711d4279778063e72dd051680
deleted file mode 100644
index 9568aedfa..000000000
Binary files a/test/integration/squash/expected/.git_keep/objects/35/bf02987e13a6d711d4279778063e72dd051680 and /dev/null differ
diff --git a/test/integration/squash/expected/.git_keep/objects/47/e0e1f091e2be405f3e23e75eede4f6e392eda3 b/test/integration/squash/expected/.git_keep/objects/47/e0e1f091e2be405f3e23e75eede4f6e392eda3
new file mode 100644
index 000000000..7418a5b13
Binary files /dev/null and b/test/integration/squash/expected/.git_keep/objects/47/e0e1f091e2be405f3e23e75eede4f6e392eda3 differ
diff --git a/test/integration/squash/expected/.git_keep/objects/51/a88edd955132342caad6512e92d25164b5f7d3 b/test/integration/squash/expected/.git_keep/objects/51/a88edd955132342caad6512e92d25164b5f7d3
deleted file mode 100644
index faddde627..000000000
--- a/test/integration/squash/expected/.git_keep/objects/51/a88edd955132342caad6512e92d25164b5f7d3
+++ /dev/null
@@ -1,2 +0,0 @@
-x
��K
-�0@]��2�ɯ "t�cL�	[J���n���kks�8�S�E4
cf�k�Lƺ��sM��RŰ%J�6���5�T�1��5a!�'�%��GP��u�㤯�t�7�m�K^�M�"��@����ڧ΋8���:'
\ No newline at end of file
diff --git a/test/integration/squash/expected/.git_keep/objects/5e/f618ee84d1fbb6f277996061996ce5ec0faf4e b/test/integration/squash/expected/.git_keep/objects/5e/f618ee84d1fbb6f277996061996ce5ec0faf4e
deleted file mode 100644
index 871b5bdc9..000000000
--- a/test/integration/squash/expected/.git_keep/objects/5e/f618ee84d1fbb6f277996061996ce5ec0faf4e
+++ /dev/null
@@ -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=�
\ No newline at end of file
diff --git a/test/integration/squash/expected/.git_keep/objects/75/afa841946755c424097363ba4e5682951b02e3 b/test/integration/squash/expected/.git_keep/objects/75/afa841946755c424097363ba4e5682951b02e3
deleted file mode 100644
index 4f9ce91c1..000000000
Binary files a/test/integration/squash/expected/.git_keep/objects/75/afa841946755c424097363ba4e5682951b02e3 and /dev/null differ
diff --git a/test/integration/squash/expected/.git_keep/objects/ac/0b81af0c436000141d41d6bfbf61fe41567eca b/test/integration/squash/expected/.git_keep/objects/ac/0b81af0c436000141d41d6bfbf61fe41567eca
deleted file mode 100644
index 0e42ce654..000000000
Binary files a/test/integration/squash/expected/.git_keep/objects/ac/0b81af0c436000141d41d6bfbf61fe41567eca and /dev/null differ
diff --git a/test/integration/squash/expected/.git_keep/objects/b1/9c1df5dc3e523e78444cbaa07a81a89f19a4aa b/test/integration/squash/expected/.git_keep/objects/b1/9c1df5dc3e523e78444cbaa07a81a89f19a4aa
new file mode 100644
index 000000000..7d8b69778
Binary files /dev/null and b/test/integration/squash/expected/.git_keep/objects/b1/9c1df5dc3e523e78444cbaa07a81a89f19a4aa differ
diff --git a/test/integration/squash/expected/.git_keep/objects/db/27c30903c7fa6564e9c925097a03b88e6b67e7 b/test/integration/squash/expected/.git_keep/objects/db/27c30903c7fa6564e9c925097a03b88e6b67e7
deleted file mode 100644
index 7ce662ad9..000000000
Binary files a/test/integration/squash/expected/.git_keep/objects/db/27c30903c7fa6564e9c925097a03b88e6b67e7 and /dev/null differ
diff --git a/test/integration/squash/expected/.git_keep/objects/e1/1ec0e7a753a2cc10e348948173064e17d127d6 b/test/integration/squash/expected/.git_keep/objects/e1/1ec0e7a753a2cc10e348948173064e17d127d6
new file mode 100644
index 000000000..bf8f83204
--- /dev/null
+++ b/test/integration/squash/expected/.git_keep/objects/e1/1ec0e7a753a2cc10e348948173064e17d127d6
@@ -0,0 +1,2 @@
+x
��A
+�0@Ѯs��ʌ���\y��L������#t�y�S5[˥��*�`�ŏ2�R���T</�g��й�n�z�4�}�����ozK�@B~�	�������ٷ����
3�,�
\ No newline at end of file
diff --git a/test/integration/squash/expected/.git_keep/refs/heads/master b/test/integration/squash/expected/.git_keep/refs/heads/master
index db941a31f..c90d05882 100644
--- a/test/integration/squash/expected/.git_keep/refs/heads/master
+++ b/test/integration/squash/expected/.git_keep/refs/heads/master
@@ -1 +1 @@
-5ef618ee84d1fbb6f277996061996ce5ec0faf4e
+47e0e1f091e2be405f3e23e75eede4f6e392eda3
diff --git a/test/integration/squash/recording.json b/test/integration/squash/recording.json
index 5bb4996b7..d431b9bcc 100644
--- a/test/integration/squash/recording.json
+++ b/test/integration/squash/recording.json
@@ -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=="}}]
\ No newline at end of file
+{"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}]}
\ No newline at end of file