mirror of
https://github.com/jesseduffield/lazygit.git
synced 2025-07-30 03:23:08 +03:00
add integration tests for cherry picking
This commit is contained in:
Jesse Duffield
@ -1,15 +0,0 @@
|
||||
fourth commit on develop
|
||||
|
||||
# Please enter the commit message for your changes. Lines starting
|
||||
# with '#' will be ignored, and an empty message aborts the commit.
|
||||
#
|
||||
# interactive rebase in progress; onto 696a8fd
|
||||
# Last commands done (2 commands done):
|
||||
# pick 234e2fa third commit on develop
|
||||
# pick 0556e5d fourth commit on develop
|
||||
# No commands remaining.
|
||||
# You are currently rebasing branch 'other_branch' on '696a8fd'.
|
||||
#
|
||||
# Changes to be committed:
|
||||
# modified: file5
|
||||
#
|
||||
@ -1 +0,0 @@
|
||||
ref: refs/heads/other_branch
|
||||
@ -1 +0,0 @@
|
||||
696a8fd43c580b3bed203977faab4566b052a4e4
|
||||
@ -1 +0,0 @@
|
||||
0556e5da1cda4e150d6cc1182be6efdb061f59fe
|
||||
Binary file not shown.
@ -1,40 +0,0 @@
|
||||
0000000000000000000000000000000000000000 2cf63d6da8c52131dd79622f8572b44a1267e420 CI <CI@example.com> 1617673072 +1000 commit (initial): first commit
|
||||
2cf63d6da8c52131dd79622f8572b44a1267e420 2cf63d6da8c52131dd79622f8572b44a1267e420 CI <CI@example.com> 1617673072 +1000 checkout: moving from master to feature/cherry-picking
|
||||
2cf63d6da8c52131dd79622f8572b44a1267e420 e4aa98b835d0a871d9ea02e6d286f0fbb2204cdc CI <CI@example.com> 1617673072 +1000 commit: first commit freshman year
|
||||
e4aa98b835d0a871d9ea02e6d286f0fbb2204cdc ef029771f117b5f31c972dfa546037662e243ca7 CI <CI@example.com> 1617673072 +1000 commit: second commit subway eat fresh
|
||||
ef029771f117b5f31c972dfa546037662e243ca7 2493c87610e0a9b8edfca592cb01a027f60ce587 CI <CI@example.com> 1617673072 +1000 commit: third commit fresh
|
||||
2493c87610e0a9b8edfca592cb01a027f60ce587 d8e5ca46d2bbd7c115e5849e637efe2361203368 CI <CI@example.com> 1617673072 +1000 commit: fourth commit cool
|
||||
d8e5ca46d2bbd7c115e5849e637efe2361203368 78a5ec82970200538b70f5ac61c18acb45ccb8ee CI <CI@example.com> 1617673072 +1000 commit: fifth commit nice
|
||||
78a5ec82970200538b70f5ac61c18acb45ccb8ee 19079c78db18112c5a2720896a040014a2d05f6d CI <CI@example.com> 1617673072 +1000 commit: sixth commit haha
|
||||
19079c78db18112c5a2720896a040014a2d05f6d 4520f99d650662a3f597a200fea5f2599f528180 CI <CI@example.com> 1617673072 +1000 commit: seventh commit yeah
|
||||
4520f99d650662a3f597a200fea5f2599f528180 9bb8cd97914c8e8a7b8a6ec6f94bca0b09fa0048 CI <CI@example.com> 1617673072 +1000 commit: eighth commit woo
|
||||
9bb8cd97914c8e8a7b8a6ec6f94bca0b09fa0048 9bb8cd97914c8e8a7b8a6ec6f94bca0b09fa0048 CI <CI@example.com> 1617673072 +1000 checkout: moving from feature/cherry-picking to develop
|
||||
9bb8cd97914c8e8a7b8a6ec6f94bca0b09fa0048 7923e4a952f4b169373b0389be6a9db3cd929547 CI <CI@example.com> 1617673072 +1000 commit: first commit on develop
|
||||
7923e4a952f4b169373b0389be6a9db3cd929547 2cf63d6da8c52131dd79622f8572b44a1267e420 CI <CI@example.com> 1617673072 +1000 checkout: moving from develop to master
|
||||
2cf63d6da8c52131dd79622f8572b44a1267e420 bfcc5725cd2ef871ff804996f4e02beef3e4dec2 CI <CI@example.com> 1617673072 +1000 commit: first commit on master
|
||||
bfcc5725cd2ef871ff804996f4e02beef3e4dec2 7923e4a952f4b169373b0389be6a9db3cd929547 CI <CI@example.com> 1617673072 +1000 checkout: moving from master to develop
|
||||
7923e4a952f4b169373b0389be6a9db3cd929547 7317cf7580efd92f974c8dfb3cde84eded8dafec CI <CI@example.com> 1617673072 +1000 commit: second commit on develop
|
||||
7317cf7580efd92f974c8dfb3cde84eded8dafec bfcc5725cd2ef871ff804996f4e02beef3e4dec2 CI <CI@example.com> 1617673072 +1000 checkout: moving from develop to master
|
||||
bfcc5725cd2ef871ff804996f4e02beef3e4dec2 f4ffac820a371104fe611d81bc13a45b70a3ebb3 CI <CI@example.com> 1617673072 +1000 commit: second commit on master
|
||||
f4ffac820a371104fe611d81bc13a45b70a3ebb3 7317cf7580efd92f974c8dfb3cde84eded8dafec CI <CI@example.com> 1617673072 +1000 checkout: moving from master to develop
|
||||
7317cf7580efd92f974c8dfb3cde84eded8dafec 234e2fa9a01b8d7e849b0c2a1bbd550e788ea18d CI <CI@example.com> 1617673072 +1000 commit: third commit on develop
|
||||
234e2fa9a01b8d7e849b0c2a1bbd550e788ea18d f4ffac820a371104fe611d81bc13a45b70a3ebb3 CI <CI@example.com> 1617673072 +1000 checkout: moving from develop to master
|
||||
f4ffac820a371104fe611d81bc13a45b70a3ebb3 facb56c48e4718f71c08116153c93d87bc699671 CI <CI@example.com> 1617673072 +1000 commit: third commit on master
|
||||
facb56c48e4718f71c08116153c93d87bc699671 234e2fa9a01b8d7e849b0c2a1bbd550e788ea18d CI <CI@example.com> 1617673072 +1000 checkout: moving from master to develop
|
||||
234e2fa9a01b8d7e849b0c2a1bbd550e788ea18d 0556e5da1cda4e150d6cc1182be6efdb061f59fe CI <CI@example.com> 1617673072 +1000 commit: fourth commit on develop
|
||||
0556e5da1cda4e150d6cc1182be6efdb061f59fe facb56c48e4718f71c08116153c93d87bc699671 CI <CI@example.com> 1617673072 +1000 checkout: moving from develop to master
|
||||
facb56c48e4718f71c08116153c93d87bc699671 339e2d062760be9ecdb4bb90f97bdb0e634e7831 CI <CI@example.com> 1617673072 +1000 commit: fourth commit on master
|
||||
339e2d062760be9ecdb4bb90f97bdb0e634e7831 339e2d062760be9ecdb4bb90f97bdb0e634e7831 CI <CI@example.com> 1617673072 +1000 checkout: moving from master to base_branch
|
||||
339e2d062760be9ecdb4bb90f97bdb0e634e7831 5d2484f3cb6ce658e296526c48e1a376b2790dfc CI <CI@example.com> 1617673072 +1000 commit: file
|
||||
5d2484f3cb6ce658e296526c48e1a376b2790dfc 5d2484f3cb6ce658e296526c48e1a376b2790dfc CI <CI@example.com> 1617673072 +1000 checkout: moving from base_branch to other_branch
|
||||
5d2484f3cb6ce658e296526c48e1a376b2790dfc 5d2484f3cb6ce658e296526c48e1a376b2790dfc CI <CI@example.com> 1617673072 +1000 checkout: moving from other_branch to base_branch
|
||||
5d2484f3cb6ce658e296526c48e1a376b2790dfc 68728b56ed31d03ca94496b9e2a45c62ba0f4e8f CI <CI@example.com> 1617673072 +1000 commit: file changed
|
||||
68728b56ed31d03ca94496b9e2a45c62ba0f4e8f 5d2484f3cb6ce658e296526c48e1a376b2790dfc CI <CI@example.com> 1617673072 +1000 checkout: moving from base_branch to other_branch
|
||||
5d2484f3cb6ce658e296526c48e1a376b2790dfc 5d2484f3cb6ce658e296526c48e1a376b2790dfc CI <CI@example.com> 1617673078 +1000 rebase -i (start): checkout HEAD
|
||||
5d2484f3cb6ce658e296526c48e1a376b2790dfc 65c0438e428cd1aa94588eaa52eb7ebad7ec62fd CI <CI@example.com> 1617673078 +1000 rebase -i (pick): second commit subway eat fresh
|
||||
65c0438e428cd1aa94588eaa52eb7ebad7ec62fd 16f2bcca6ce7bcc17277103a5555072a6c3322a2 CI <CI@example.com> 1617673078 +1000 rebase -i (pick): third commit fresh
|
||||
16f2bcca6ce7bcc17277103a5555072a6c3322a2 696a8fd43c580b3bed203977faab4566b052a4e4 CI <CI@example.com> 1617673078 +1000 rebase -i (pick): fourth commit cool
|
||||
696a8fd43c580b3bed203977faab4566b052a4e4 696a8fd43c580b3bed203977faab4566b052a4e4 CI <CI@example.com> 1617673078 +1000 rebase -i (finish): returning to refs/heads/other_branch
|
||||
696a8fd43c580b3bed203977faab4566b052a4e4 696a8fd43c580b3bed203977faab4566b052a4e4 CI <CI@example.com> 1617673084 +1000 rebase -i (start): checkout HEAD
|
||||
696a8fd43c580b3bed203977faab4566b052a4e4 b8ab98a9ab0599193a3f41a9cc5cb988283e6722 CI <CI@example.com> 1617673088 +1000 rebase -i (continue): fourth commit on develop
|
||||
b8ab98a9ab0599193a3f41a9cc5cb988283e6722 b8ab98a9ab0599193a3f41a9cc5cb988283e6722 CI <CI@example.com> 1617673088 +1000 rebase -i (finish): returning to refs/heads/other_branch
|
||||
@ -1,3 +0,0 @@
|
||||
0000000000000000000000000000000000000000 339e2d062760be9ecdb4bb90f97bdb0e634e7831 CI <CI@example.com> 1617673072 +1000 branch: Created from HEAD
|
||||
339e2d062760be9ecdb4bb90f97bdb0e634e7831 5d2484f3cb6ce658e296526c48e1a376b2790dfc CI <CI@example.com> 1617673072 +1000 commit: file
|
||||
5d2484f3cb6ce658e296526c48e1a376b2790dfc 68728b56ed31d03ca94496b9e2a45c62ba0f4e8f CI <CI@example.com> 1617673072 +1000 commit: file changed
|
||||
@ -1,5 +0,0 @@
|
||||
0000000000000000000000000000000000000000 9bb8cd97914c8e8a7b8a6ec6f94bca0b09fa0048 CI <CI@example.com> 1617673072 +1000 branch: Created from HEAD
|
||||
9bb8cd97914c8e8a7b8a6ec6f94bca0b09fa0048 7923e4a952f4b169373b0389be6a9db3cd929547 CI <CI@example.com> 1617673072 +1000 commit: first commit on develop
|
||||
7923e4a952f4b169373b0389be6a9db3cd929547 7317cf7580efd92f974c8dfb3cde84eded8dafec CI <CI@example.com> 1617673072 +1000 commit: second commit on develop
|
||||
7317cf7580efd92f974c8dfb3cde84eded8dafec 234e2fa9a01b8d7e849b0c2a1bbd550e788ea18d CI <CI@example.com> 1617673072 +1000 commit: third commit on develop
|
||||
234e2fa9a01b8d7e849b0c2a1bbd550e788ea18d 0556e5da1cda4e150d6cc1182be6efdb061f59fe CI <CI@example.com> 1617673072 +1000 commit: fourth commit on develop
|
||||
@ -1,9 +0,0 @@
|
||||
0000000000000000000000000000000000000000 2cf63d6da8c52131dd79622f8572b44a1267e420 CI <CI@example.com> 1617673072 +1000 branch: Created from HEAD
|
||||
2cf63d6da8c52131dd79622f8572b44a1267e420 e4aa98b835d0a871d9ea02e6d286f0fbb2204cdc CI <CI@example.com> 1617673072 +1000 commit: first commit freshman year
|
||||
e4aa98b835d0a871d9ea02e6d286f0fbb2204cdc ef029771f117b5f31c972dfa546037662e243ca7 CI <CI@example.com> 1617673072 +1000 commit: second commit subway eat fresh
|
||||
ef029771f117b5f31c972dfa546037662e243ca7 2493c87610e0a9b8edfca592cb01a027f60ce587 CI <CI@example.com> 1617673072 +1000 commit: third commit fresh
|
||||
2493c87610e0a9b8edfca592cb01a027f60ce587 d8e5ca46d2bbd7c115e5849e637efe2361203368 CI <CI@example.com> 1617673072 +1000 commit: fourth commit cool
|
||||
d8e5ca46d2bbd7c115e5849e637efe2361203368 78a5ec82970200538b70f5ac61c18acb45ccb8ee CI <CI@example.com> 1617673072 +1000 commit: fifth commit nice
|
||||
78a5ec82970200538b70f5ac61c18acb45ccb8ee 19079c78db18112c5a2720896a040014a2d05f6d CI <CI@example.com> 1617673072 +1000 commit: sixth commit haha
|
||||
19079c78db18112c5a2720896a040014a2d05f6d 4520f99d650662a3f597a200fea5f2599f528180 CI <CI@example.com> 1617673072 +1000 commit: seventh commit yeah
|
||||
4520f99d650662a3f597a200fea5f2599f528180 9bb8cd97914c8e8a7b8a6ec6f94bca0b09fa0048 CI <CI@example.com> 1617673072 +1000 commit: eighth commit woo
|
||||
@ -1,5 +0,0 @@
|
||||
0000000000000000000000000000000000000000 2cf63d6da8c52131dd79622f8572b44a1267e420 CI <CI@example.com> 1617673072 +1000 commit (initial): first commit
|
||||
2cf63d6da8c52131dd79622f8572b44a1267e420 bfcc5725cd2ef871ff804996f4e02beef3e4dec2 CI <CI@example.com> 1617673072 +1000 commit: first commit on master
|
||||
bfcc5725cd2ef871ff804996f4e02beef3e4dec2 f4ffac820a371104fe611d81bc13a45b70a3ebb3 CI <CI@example.com> 1617673072 +1000 commit: second commit on master
|
||||
f4ffac820a371104fe611d81bc13a45b70a3ebb3 facb56c48e4718f71c08116153c93d87bc699671 CI <CI@example.com> 1617673072 +1000 commit: third commit on master
|
||||
facb56c48e4718f71c08116153c93d87bc699671 339e2d062760be9ecdb4bb90f97bdb0e634e7831 CI <CI@example.com> 1617673072 +1000 commit: fourth commit on master
|
||||
@ -1,3 +0,0 @@
|
||||
0000000000000000000000000000000000000000 5d2484f3cb6ce658e296526c48e1a376b2790dfc CI <CI@example.com> 1617673072 +1000 branch: Created from HEAD
|
||||
5d2484f3cb6ce658e296526c48e1a376b2790dfc 696a8fd43c580b3bed203977faab4566b052a4e4 CI <CI@example.com> 1617673078 +1000 rebase -i (finish): refs/heads/other_branch onto 5d2484f3cb6ce658e296526c48e1a376b2790dfc
|
||||
696a8fd43c580b3bed203977faab4566b052a4e4 b8ab98a9ab0599193a3f41a9cc5cb988283e6722 CI <CI@example.com> 1617673088 +1000 rebase -i (finish): refs/heads/other_branch onto 696a8fd43c580b3bed203977faab4566b052a4e4
|
||||
Binary file not shown.
Binary file not shown.
@ -1,4 +0,0 @@
|
||||
x<01><><EFBFBD>
|
||||
<EFBFBD>0<10>a<EFBFBD>y<EFBFBD><79> <0B>L<EFBFBD><1B>]<5D>1&Ʉ
|
||||
Ɩ<18><>7<EFBFBD>{<7B><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Zo P<>Cò
|
||||
}<7D>Ig.<2E>g<EFBFBD>Hڇ` ,9<>ɛ<>X<EFBFBD><58>?:X<><58><EFBFBD>=O<>eE&<26>=<19><>8Rv<52>젂^}<7D><1A> <0B><><EFBFBD><EFBFBD>o<EFBFBD><6F><EFBFBD>Oi<4F>PV9<56><39>tG%<25>c <1D>:<3A><><EFBFBD>/}<7D><> _<05><>s <1F><>?<3F>
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -1,2 +0,0 @@
|
||||
x<01><>A
|
||||
<EFBFBD>0E<><45>)f_(3&:J)<29><>13AA<41>HZz<5A>z<>n <1F><>_<EFBFBD>۶h/<2F>T<05>z<EFBFBD>@(<28>)<29><>y"<22><><EFBFBD><EFBFBD>`'<27>,z<><7A>><3E>#<23><>`K <13>=j<12>T<EFBFBD><54>^<5E>d<EFBFBD>h<EFBFBD>TTz I<> <09>2<EFBFBD><13><11><><EFBFBD><EFBFBD>O؎Uo1o<0F><><EFBFBD><EFBFBD>/<2F><><EFBFBD><10>TZ<54><5A><EFBFBD>97e^N<><4E>yѷ<><D1B7>0_- Ax
|
||||
Binary file not shown.
@ -1,3 +0,0 @@
|
||||
x<01><>K
|
||||
<EFBFBD>0@]<5D><14>d2<64><32><11><> #<23>L<EFBFBD>`m<><<3C>/<2F><><EFBFBD> <Y<><59>ށ0 zS<7A>rN,<01><><EFBFBD>)S<><53>A<EFBFBD><41><EFBFBD><EFBFBD>F<EFBFBD><46><EFBFBD><EFBFBD>s<EFBFBD>fKM<4B> <1D>"
|
||||
̶Z<EFBFBD>9Tge`*5 <1F>q<EFBFBD>s<EFBFBD>N<12><><EFBFBD><EFBFBD><EFBFBD>`<60><>2N7<4E><37>e{<7B>I<EFBFBD><49>
|
||||
Binary file not shown.
Binary file not shown.
@ -1,2 +0,0 @@
|
||||
x<01><>M
|
||||
<EFBFBD> <10><><EFBFBD>=<3D><> <0B>ɏ<EFBFBD>PJ!<21> CǑj
|
||||
Binary file not shown.
Binary file not shown.
@ -1 +0,0 @@
|
||||
x}<7D><> <09>0=<3D><><EFBFBD> <20><>QA<>6<EFBFBD>>1`|<7C><><EFBFBD>o w<><77> <0C><><EFBFBD> j<><6A><EFBFBD><EFBFBD>yF<><46>JH7_0<5F><30><11>A<EFBFBD><EFBFBD>} <20><15>U<EFBFBD>)<29>}<01><><EFBFBD><EFBFBD>FJ<46>{<7B>oX<6F>9<1B>o6z<36><7A>[|G<>,<2C>
|
||||
@ -1,3 +0,0 @@
|
||||
x<01><>K
|
||||
<EFBFBD>0@]<5D><14>df<64><66>@D<><44>cL<63>)<15>-5<><35>ނp<>x^<5E>k<EFBFBD>6`t<><74><EFBFBD>BA<42><41>gv<67>lk<13>i<><69>)H<16>$<24><>ؙEV<45>7<EFBFBD><37>>f J<>@<40><>
|
||||
{<7B><10>`<60>H<EFBFBD>pA;<3B>b<EFBFBD>٦y<D9A6><79><02><>rַ<72>妇<<3C><13>#<23>|<7C><>aO<61>h6<68>M5<4D>S7}m/<13>:<3A><>L<EFBFBD> QR>8
|
||||
@ -1 +0,0 @@
|
||||
x<01><><EFBFBD> <09>0C<>v<EFBFBD>L<EFBFBD> <1F>\<5C>j<EFBFBD>VО<56>W<EFBFBD><57>= <1D><05><08><><EFBFBD><EFBFBD><EFBFBD>M<<3C>i<EFBFBD>f.<2E><><EFBFBD>PU<50>M<>HT<48><54>3T<33>`Q<><51><EFBFBD>9<EFBFBD>"<22>^<5E><>h<EFBFBD>d[<5B><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>i+B<><42>;<3B>~<7E>/ Y :/<2F><1B><P<>
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -1,2 +0,0 @@
|
||||
x<01><>A
|
||||
<EFBFBD> @Ѯ=<3D><>Bщ<42>(<28>R<EFBFBD>*<2A><>ql5 <09>B<EFBFBD><42> <1C><><EFBFBD>[|<7C>Z[<5B><>1^<5E>!<21><>u<EFBFBD>T)rD<72>m*<2A>kL<6B><4C>yap@LE@<40>鐵k_<6B>W<07>Ȃ>D<><44><EFBFBD><EFBFBD><EFBFBD>4f<>hJe<4A>>}<7D>=N<>>NO<4E><4F><EFBFBD><EFBFBD><EFBFBD><EFBFBD>[{h<><68><EFBFBD>C<><43><EFBFBD><18><>zNu<4E><75><EFBFBD><EFBFBD><EFBFBD>E<EFBFBD><45>֗<14>Y{<<3C>
|
||||
Binary file not shown.
Binary file not shown.
@ -1,2 +0,0 @@
|
||||
x<01><>K
|
||||
<EFBFBD>0@]<5D><14>d<>I<EFBFBD><11><> #<23>LQ0M<30>Q<<3C>/<2F><><EFBFBD> <1E><>j<EFBFBD>w0Z <1F>&3<>.<2E><>`v<12>Ț<EFBFBD>Y<EFBFBD>r<0E><><15>D<EFBFBD>^<5E>i<EFBFBD><69><EFBFBD><EFBFBD><EFBFBD>Ħ8<C4A6><38>f<EFBFBD>"y<>H!fq)r<><72><EFBFBD><EFBFBD><EFBFBD>z<EFBFBD>^<5E><>6'8<><38>U><3E><>9<>V/<2F><><EFBFBD><EFBFBD>zG<><47>j<EFBFBD><6A>T<EFBFBD>?u<><75><EFBFBD><16>_m<01><><ڪ<>/:@<40>
|
||||
Binary file not shown.
@ -1,2 +0,0 @@
|
||||
x<01><>I
|
||||
<EFBFBD>@]<5D>)<29>^<5E><>C~w@D<>*<2A><><EFBFBD>5 <09><>Ђ<EFBFBD>7<EFBFBD><05>UPy[<5B><><EFBFBD>awi@V<><56><16><><02>C\ 8{]PSL<53><4C><EFBFBD>)1d<31><64>k<><12><>褘<EFBFBD><E8A498><EFBFBD>Zw<5A><77>;;<3B>Qa<51>h<EFBFBD><68>JP<4A>ݦ<EFBFBD><DDA6>a<EFBFBD><61>0><3E><><EFBFBD><EFBFBD><EFBFBD>-o˃<6F>h/7t<37>̬NzN5<4E><35><EFBFBD>:<3A>6ѯ<36>u<EFBFBD>P_<50>?>c
|
||||
@ -1,3 +0,0 @@
|
||||
x<01><>K
|
||||
<EFBFBD>0@]<5D><14>d<>L<EFBFBD><11><> #<23>N<EFBFBD><4E>6%F<><46><16><><EFBFBD><EFBFBD>{<7B><><EFBFBD><EFBFBD>ܠ<EFBFBD>xjU:<3A>ّw<D991>^<5E>1Ȝ<31> {#<0E><>~<7E>M<EFBFBD>4<EFBFBD><34>c<EFBFBD><63>AH<41><48>\<5C><>^|t<>G+ls<6C><73><13> ɫ<>j<EFBFBD>Ra<18>:<3A>w<EFBFBD><77>u_<75><5F>e<EFBFBD><65><EFBFBD><EFBFBD>Yg<59>upֈ<70>zL5<4C>SWy<57><79><06>
|
||||
<EFBFBD><06><>e)<29><><02>f@f
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -1,2 +0,0 @@
|
||||
x<01><>M
|
||||
<EFBFBD>0<10>a<EFBFBD>9<EFBFBD><39>I&?<3F><><EFBFBD><EFBFBD>U<EFBFBD><55><EFBFBD>,S<> ߀p<><70>><3E><>Z<EFBFBD><5A>e8<65><38> 6k66<36>Ÿf<><66><EFBFBD><EFBFBD>OFs<46><73><EFBFBD>N <1E>{l<>0e<30>W<EFBFBD>F<EFBFBD>,*<2A>֕<EFBFBD>C<EFBFBD><43>.<2E>D<EFBFBD><44>ؠ<14><> <1F><>4<EFBFBD>u<EFBFBD><75><EFBFBD><EFBFBD>e<65>%<25>r<03>9Ғ<10>JJ)<29>:Nu<4E>3ykG<6B><47><EFBFBD><EFBFBD><EFBFBD><12><><EFBFBD><17><>><3E>
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -1,2 +0,0 @@
|
||||
x<01><>A
|
||||
<EFBFBD> D<><44><14> <0B>k<12>B)<29><>r<EFBFBD>QH!<21>!<18><>+<2B>]
|
||||
Binary file not shown.
@ -1 +0,0 @@
|
||||
x<01><><EFBFBD> <09>0C<><43><14><>?<3F>3<EFBFBD>Ƶ V<>=iO<69><4F>= <1D><05><08><><EFBFBD><EFBFBD><EFBFBD>,<01>8tW<><57>@h*<2A><>&R$j<08>*y<><79>ʑs-ܜ<><DC9C>8v)<29><>u㧱<75><E3A7B1>V<EFBFBD>H<EFBFBD><48><EFBFBD><EFBFBD><EFBFBD><17>"<0F><17>
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -1,2 +0,0 @@
|
||||
x<01><>A
|
||||
1=<3D>s$<24><>daO<61><4F><EFBFBD>I<05>J<EFBFBD><4A><EFBFBD>w<EFBFBD>x-<2D><>ҥ<EFBFBD>k'v~<7E>@ Udw<64>"<0E><><17><>=<3D>U<EFBFBD>8H<19>C%<25> <1C> <0C>_O\<5C><><10>˰O<<3C> <20>cB`k<><6B>/K<>q<EFBFBD><71>8<EFBFBD><38><EFBFBD><EFBFBD><EFBFBD>a<EFBFBD>K=<3D><>.<2E><>mb<6D>:k<>Y<EFBFBD><1A><><EFBFBD>ܔk{v<>YT<1A><>*w<>@<40><>{/B<>
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -1,2 +0,0 @@
|
||||
x}<7D>K
|
||||
<EFBFBD> <14><>Ʈ<EFBFBD><C6AE>@<40><>QAA<41><41>q<EFBFBD> <20>bZ<62>Op<4F>7<<3C>pWT<57>*<2A> <0C>4<EFBFBD><34><EFBFBD>F<EFBFBD><46>-<16><><10>&Ox<4F>;
|
||||
Binary file not shown.
Binary file not shown.
@ -1,2 +0,0 @@
|
||||
x<01><>A
|
||||
<EFBFBD>0E]<5D><14>d<>I<EFBFBD>D<><44>z<EFBFBD>I:<3A>cJ<63><4A><EFBFBD>
|
||||
Binary file not shown.
@ -1 +0,0 @@
|
||||
68728b56ed31d03ca94496b9e2a45c62ba0f4e8f
|
||||
@ -1 +0,0 @@
|
||||
0556e5da1cda4e150d6cc1182be6efdb061f59fe
|
||||
@ -1 +0,0 @@
|
||||
9bb8cd97914c8e8a7b8a6ec6f94bca0b09fa0048
|
||||
@ -1 +0,0 @@
|
||||
339e2d062760be9ecdb4bb90f97bdb0e634e7831
|
||||
@ -1 +0,0 @@
|
||||
b8ab98a9ab0599193a3f41a9cc5cb988283e6722
|
||||
@ -1 +0,0 @@
|
||||
this is file number 3 that I'm going to cherry-pick
|
||||
@ -1 +0,0 @@
|
||||
this is file number 4 that I'm going to cherry-pick
|
||||
@ -1 +0,0 @@
|
||||
this is file number 5 that I'm going to cherry-pick
|
||||
@ -1 +0,0 @@
|
||||
test3
|
||||
@ -1 +0,0 @@
|
||||
test3
|
||||
@ -1 +0,0 @@
|
||||
original1\noriginal2\noriginal3
|
||||
@ -1,63 +0,0 @@
|
||||
Here is a story that has been told throuhg the ages
|
||||
once upon a time there was a cat
|
||||
...
|
||||
...
|
||||
...
|
||||
...
|
||||
...
|
||||
...
|
||||
...
|
||||
...
|
||||
...
|
||||
...
|
||||
...
|
||||
...
|
||||
...
|
||||
...
|
||||
...
|
||||
...
|
||||
...
|
||||
...
|
||||
...
|
||||
...
|
||||
...
|
||||
...
|
||||
...
|
||||
...
|
||||
...
|
||||
...
|
||||
...
|
||||
...
|
||||
...
|
||||
...
|
||||
...
|
||||
...
|
||||
...
|
||||
...
|
||||
...
|
||||
...
|
||||
...
|
||||
...
|
||||
...
|
||||
...
|
||||
...
|
||||
...
|
||||
...
|
||||
...
|
||||
...
|
||||
...
|
||||
...
|
||||
...
|
||||
...
|
||||
...
|
||||
...
|
||||
...
|
||||
...
|
||||
...
|
||||
...
|
||||
...
|
||||
...
|
||||
...
|
||||
...
|
||||
...
|
||||
once upon a time there was another cat
|
||||
@ -1 +0,0 @@
|
||||
once upon a time there was a horse
|
||||
@ -1 +0,0 @@
|
||||
once upon a time there was a horse
|
||||
@ -1 +0,0 @@
|
||||
once upon a time there was a mouse
|
||||
@ -1 +0,0 @@
|
||||
{"KeyEvents":[{"Timestamp":417,"Mod":0,"Key":259,"Ch":0},{"Timestamp":761,"Mod":0,"Key":258,"Ch":0},{"Timestamp":905,"Mod":0,"Key":258,"Ch":0},{"Timestamp":1041,"Mod":0,"Key":258,"Ch":0},{"Timestamp":1248,"Mod":0,"Key":13,"Ch":13},{"Timestamp":1537,"Mod":0,"Key":258,"Ch":0},{"Timestamp":1656,"Mod":0,"Key":258,"Ch":0},{"Timestamp":1809,"Mod":0,"Key":258,"Ch":0},{"Timestamp":1929,"Mod":0,"Key":258,"Ch":0},{"Timestamp":2065,"Mod":0,"Key":258,"Ch":0},{"Timestamp":2193,"Mod":0,"Key":258,"Ch":0},{"Timestamp":2344,"Mod":0,"Key":258,"Ch":0},{"Timestamp":2481,"Mod":0,"Key":258,"Ch":0},{"Timestamp":3112,"Mod":0,"Key":256,"Ch":99},{"Timestamp":3624,"Mod":0,"Key":258,"Ch":0},{"Timestamp":3777,"Mod":0,"Key":258,"Ch":0},{"Timestamp":4009,"Mod":0,"Key":256,"Ch":67},{"Timestamp":4697,"Mod":0,"Key":259,"Ch":0},{"Timestamp":4936,"Mod":0,"Key":256,"Ch":118},{"Timestamp":5296,"Mod":0,"Key":13,"Ch":13},{"Timestamp":5881,"Mod":0,"Key":260,"Ch":0},{"Timestamp":6024,"Mod":0,"Key":260,"Ch":0},{"Timestamp":6456,"Mod":0,"Key":259,"Ch":0},{"Timestamp":6816,"Mod":0,"Key":256,"Ch":99},{"Timestamp":7041,"Mod":0,"Key":257,"Ch":0},{"Timestamp":7152,"Mod":0,"Key":256,"Ch":99},{"Timestamp":7329,"Mod":0,"Key":257,"Ch":0},{"Timestamp":7424,"Mod":0,"Key":256,"Ch":99},{"Timestamp":8040,"Mod":0,"Key":257,"Ch":0},{"Timestamp":8184,"Mod":0,"Key":257,"Ch":0},{"Timestamp":8329,"Mod":0,"Key":257,"Ch":0},{"Timestamp":8497,"Mod":0,"Key":257,"Ch":0},{"Timestamp":8673,"Mod":0,"Key":257,"Ch":0},{"Timestamp":8856,"Mod":0,"Key":257,"Ch":0},{"Timestamp":9041,"Mod":0,"Key":257,"Ch":0},{"Timestamp":9233,"Mod":0,"Key":257,"Ch":0},{"Timestamp":9640,"Mod":0,"Key":256,"Ch":99},{"Timestamp":10056,"Mod":0,"Key":258,"Ch":0},{"Timestamp":10208,"Mod":0,"Key":258,"Ch":0},{"Timestamp":10736,"Mod":0,"Key":257,"Ch":0},{"Timestamp":10872,"Mod":0,"Key":256,"Ch":99},{"Timestamp":11361,"Mod":0,"Key":259,"Ch":0},{"Timestamp":11640,"Mod":0,"Key":256,"Ch":118},{"Timestamp":12048,"Mod":0,"Key":13,"Ch":13},{"Timestamp":12849,"Mod":0,"Key":13,"Ch":13},{"Timestamp":13152,"Mod":0,"Key":13,"Ch":13},{"Timestamp":13408,"Mod":0,"Key":256,"Ch":32},{"Timestamp":14009,"Mod":0,"Key":13,"Ch":13},{"Timestamp":14513,"Mod":0,"Key":13,"Ch":13},{"Timestamp":14833,"Mod":0,"Key":13,"Ch":13},{"Timestamp":15056,"Mod":0,"Key":258,"Ch":0},{"Timestamp":15296,"Mod":0,"Key":256,"Ch":32},{"Timestamp":16217,"Mod":0,"Key":13,"Ch":13},{"Timestamp":17593,"Mod":0,"Key":256,"Ch":113}],"ResizeEvents":[{"Timestamp":0,"Width":272,"Height":74}]}
|
||||
@ -1,157 +0,0 @@
|
||||
#!/bin/sh
|
||||
|
||||
set -e
|
||||
|
||||
cd $1
|
||||
|
||||
git init
|
||||
git config user.email "CI@example.com"
|
||||
git config user.name "CI"
|
||||
|
||||
|
||||
function add_spacing {
|
||||
for i in {1..60}
|
||||
do
|
||||
echo "..." >> $1
|
||||
done
|
||||
}
|
||||
|
||||
mkdir directory
|
||||
echo "test1" > directory/file
|
||||
echo "test1" > directory/file2
|
||||
|
||||
|
||||
echo "Here is a story that has been told throuhg the ages" >> file1
|
||||
|
||||
git add file1
|
||||
git add directory
|
||||
git commit -m "first commit"
|
||||
|
||||
git checkout -b feature/cherry-picking
|
||||
|
||||
echo "this is file number 1 that I'm going to cherry-pick" > cherrypicking1
|
||||
echo "this is file number 2 that I'm going to cherry-pick" > cherrypicking2
|
||||
|
||||
git add .
|
||||
|
||||
git commit -am "first commit freshman year"
|
||||
|
||||
echo "this is file number 3 that I'm going to cherry-pick" > cherrypicking3
|
||||
|
||||
git add .
|
||||
|
||||
git commit -am "second commit subway eat fresh"
|
||||
|
||||
echo "this is file number 4 that I'm going to cherry-pick" > cherrypicking4
|
||||
|
||||
git add .
|
||||
|
||||
git commit -am "third commit fresh"
|
||||
|
||||
echo "this is file number 5 that I'm going to cherry-pick" > cherrypicking5
|
||||
|
||||
git add .
|
||||
|
||||
git commit -am "fourth commit cool"
|
||||
|
||||
echo "this is file number 6 that I'm going to cherry-pick" > cherrypicking6
|
||||
|
||||
git add .
|
||||
|
||||
git commit -am "fifth commit nice"
|
||||
|
||||
echo "this is file number 7 that I'm going to cherry-pick" > cherrypicking7
|
||||
|
||||
git add .
|
||||
|
||||
git commit -am "sixth commit haha"
|
||||
|
||||
echo "this is file number 8 that I'm going to cherry-pick" > cherrypicking8
|
||||
|
||||
git add .
|
||||
|
||||
git commit -am "seventh commit yeah"
|
||||
|
||||
echo "this is file number 9 that I'm going to cherry-pick" > cherrypicking9
|
||||
|
||||
git add .
|
||||
|
||||
git commit -am "eighth commit woo"
|
||||
|
||||
|
||||
git checkout -b develop
|
||||
echo "once upon a time there was a dog" >> file1
|
||||
add_spacing file1
|
||||
echo "once upon a time there was another dog" >> file1
|
||||
git add file1
|
||||
echo "test2" > directory/file
|
||||
echo "test2" > directory/file2
|
||||
git add directory
|
||||
git commit -m "first commit on develop"
|
||||
|
||||
|
||||
git checkout master
|
||||
echo "once upon a time there was a cat" >> file1
|
||||
add_spacing file1
|
||||
echo "once upon a time there was another cat" >> file1
|
||||
git add file1
|
||||
echo "test3" > directory/file
|
||||
echo "test3" > directory/file2
|
||||
git add directory
|
||||
git commit -m "first commit on master"
|
||||
|
||||
|
||||
git checkout develop
|
||||
echo "once upon a time there was a mouse" >> file3
|
||||
git add file3
|
||||
git commit -m "second commit on develop"
|
||||
|
||||
|
||||
git checkout master
|
||||
echo "once upon a time there was a horse" >> file3
|
||||
git add file3
|
||||
git commit -m "second commit on master"
|
||||
|
||||
|
||||
git checkout develop
|
||||
echo "once upon a time there was a mouse" >> file4
|
||||
git add file4
|
||||
git commit -m "third commit on develop"
|
||||
|
||||
|
||||
git checkout master
|
||||
echo "once upon a time there was a horse" >> file4
|
||||
git add file4
|
||||
git commit -m "third commit on master"
|
||||
|
||||
|
||||
git checkout develop
|
||||
echo "once upon a time there was a mouse" >> file5
|
||||
git add file5
|
||||
git commit -m "fourth commit on develop"
|
||||
|
||||
|
||||
git checkout master
|
||||
echo "once upon a time there was a horse" >> file5
|
||||
git add file5
|
||||
git commit -m "fourth commit on master"
|
||||
|
||||
|
||||
# this is for the autostash feature
|
||||
|
||||
git checkout -b base_branch
|
||||
|
||||
echo "original1\noriginal2\noriginal3" > file
|
||||
git add file
|
||||
git commit -m "file"
|
||||
|
||||
git checkout -b other_branch
|
||||
|
||||
git checkout base_branch
|
||||
|
||||
echo "new1\noriginal2\noriginal3" > file
|
||||
git add file
|
||||
git commit -m "file changed"
|
||||
|
||||
git checkout other_branch
|
||||
|
||||
@ -1 +0,0 @@
|
||||
{ "description": "Cherry picking commits over from another branch via the sub commits context. Also resolving some merge conflicts along the way.", "speed": 5 }
|
||||
@ -0,0 +1 @@
|
||||
four
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user