1

vi ~/.gitconfig

1
2
3
4
5

git config --global http.proxy http://127.0.0.1:57158
git config --global https.proxy https://127.0.0.1:57158

git config --global http.proxy 'http://127.0.0.1:18443'
git config --global https.proxy 'https://127.0.0.1:18443'

1

git config --unset http.proxy

1
2

git config --global --unset http.proxy
git config --global --unset https.proxy

1
2
3
4
5
6

合并用这命令
git checkout main
git merge --squash -X theirs develop
git commit -m "merge from b20449b6b32915afa548b0facd7fc0525b5c0171"
git pull
git push

1
2

git checkout main
git merge feed

1

git branch

1

git checkout -b feed

1

git switch feed

1

git push origin feed

1
2
3

git fetch --all
git reset --hard origin/master
git pull

1

git reset --hard d8791ffd95a38108b5530d365cada90bc2d6cff0

1
2
3
4
5
6
7

git log develop

commit d8791ffd95a38108b5530d365cada90bc2d6cff0
Author: kangshaojun <kangshaojun@gmail.com>
Date:   Wed Jun 28 08:59:59 2023 +0800

    Change GPT logic.