main

分支 (1)

管理

管理

main

learngit
/
adfsdfaasd

[33mcommit 17832b3d1ed7d10f1a8e07552085ba94f78210ab[m[33m ([m[1;36mHEAD -> [m[1;32mmain[m[33m, [m[1;32mdev[m[33m)[m
Author: jay <bao2934991814@163.com>
Date:   Fri Dec 31 17:30:10 2021 +0800

    add merge

[33mcommit 53c6a902cc1984b46415b33ff7b6888d8133c6ef[m
Merge: b53bb07 b03afa8
Author: jay <bao2934991814@163.com>
Date:   Fri Dec 31 17:11:36 2021 +0800

    merge with no-ff

[33mcommit b03afa87728d7a6cdb2ba7612eed1f3bb7cf56aa[m
Author: jay <bao2934991814@163.com>
Date:   Fri Dec 31 17:10:25 2021 +0800

    add merge

[33mcommit b53bb07be56cf4def67f1d2e99b0f659250d763d[m[33m ([m[1;31morigin/main[m[33m)[m
Merge: 182a69e 623224b
Author: jay <bao2934991814@163.com>
Date:   Fri Dec 31 16:51:26 2021 +0800

    fixed

[33mcommit 182a69e7bb84e9f51198b992e4658c125c7f9194[m
Author: jay <bao2934991814@163.com>
Date:   Fri Dec 31 16:48:37 2021 +0800

    &

[33mcommit 623224b8a8948d4463ed7c9b56152f812efaa680[m
Author: jay <bao2934991814@163.com>
Date:   Fri Dec 31 16:47:02 2021 +0800

    and

[33mcommit 7e09ac774c38e8d30de716aec6593d5a83ee6a04[m
Merge: e70728d 11329be
Author: jay <bao2934991814@163.com>
Date:   Fri Dec 31 16:44:13 2021 +0800

    conflict

[33mcommit e70728da7792b86a9c2be7d90731cc4369dc7e59[m
Author: jay <bao2934991814@163.com>
Date:   Fri Dec 31 16:31:07 2021 +0800

    & simple

[33mcommit 11329becd1903fcdb3a64515eb669e33d7aeabac[m
Author: jay <bao2934991814@163.com>
Date:   Fri Dec 31 16:28:53 2021 +0800

    AND simple

[33mcommit 501b823666010c2b3e5c7060bb832afd123927b5[m
Author: jay <bao2934991814@163.com>
Date:   Tue Dec 28 21:37:59 2021 +0800

    branch test

[33mcommit 96701871b6437a51bcb85536e7f7c7303f60a3f4[m
Author: jay <bao2934991814@163.com>
Date:   Tue Dec 28 21:12:35 2021 +0800

    second

[33mcommit 32e8bfa17621f3ad9088377228a13b5dc4297703[m
Author: jay <bao2934991814@163.com>
Date:   Mon Dec 27 20:49:05 2021 +0800

    ghg

[33mcommit d82d8f8ff942590b3468e0faa645ee6b4fee2605[m
Author: jay <bao2934991814@163.com>
Date:   Mon Dec 27 20:43:35 2021 +0800

    ghg

[33mcommit 8a56eea66e6c0236995ba0387b6f47ebbb38e8b9[m
Author: jay <bao2934991814@163.com>
Date:   Mon Dec 27 20:35:08 2021 +0800

    understand how stage works

[33mcommit d1ca4908cfa4feab50578e3eaff92982362f2793[m
Author: jay <bao2934991814@163.com>
Date:   Mon Dec 27 20:12:55 2021 +0800

    append LOL

[33mcommit 2ded2151337bad741677645da9380272222ef1e8[m
Author: jay <bao2934991814@163.com>
Date:   Mon Dec 27 20:10:07 2021 +0800

    append GPL

[33mcommit d684f9c1d8d89888dd9a97d0f470fee3710bb871[m
Author: jay <bao2934991814@163.com>
Date:   Mon Dec 27 20:04:15 2021 +0800

    wrote a raedme file