## 从主仓库更新代码到 fork 仓库
```shell
git remote -v
git remote add github https://github.com/chenxiangfang/Main.git
git fetch github
git merge github/master
git push
```

## 从 github 中拉取变更同步到本地，并提交到 fork 仓库
```shell
git fetch github
git merge github/master
git push
git fetch github --all
git push origin --all
```

## 配置 Git 提交时的邮箱和用户名
```shell
# 全局修改
git config --global user.email "XXX@XXX.com"
git config --global user.name "cainiao"
# 当前仓库修改
git config user.email "XXX@XXX.com"
git config user.name "cainiao"
```

## 设置 HTTP/HTTPS 免密登录（git clone 第二次不需要再次输入密码了）
```bash
# Windows
git config --global credential.helper wincred
# macOS
git config --global credential.helper osxkeychain
```

## 设置 HTTP 代理
```bash
# 设置代理
git config --global http.proxy http://proxyUsername:proxyPassword@proxy.server.com:port
git config --global https.proxy https://proxyUsername:proxyPassword@proxy.server.com:port

# 取消代理
git config --global --unset http.proxy
```

## 线上Git仓库把 **master** 主分支改为了 **main** 主分支
```bash
# Switch to the "master" branch:
git checkout master

# Rename it to "main":
git branch -m master main

# Get the latest commits (and branches!) from the remote:
git fetch

# Remove the existing tracking connection with "origin/master":
git branch --unset-upstream

# Create a new tracking connection with the new "origin/main" branch:
git branch -u origin/main
```

## 我的一些全局 Git 配置
```shell
git config --global http.proxy socks5://127.0.0.1:1080
git config --global https.proxy socks5://127.0.0.1:1080

git config --global user.email "565499699@qq.com"
git config --global user.name "Xiangfang Chen"

git config --global core.autocrlf false
git config --global core.filemode false
git config --global core.preloadindex true
git config --global core.fscache true
git config --global branch.autosetuprebase always
git config --global core.longpaths true
```

## 一些脚本

### git-pull-all
- git-pull-all.sh
```bash
#!/bin/bash

echo "Running git pull on all subdirectories..."

# Find all .git directories recursively and cd to their parent to run git pull
find . -name ".git" -type d | while read gitdir; do
    # Extract the parent directory of the .git folder
    workdir=$(dirname "$gitdir")
    
    echo ""
    echo "========================================"
    echo "Pulling latest changes in: $workdir"
    echo "========================================"
    
    # Change to the repository directory and pull
    (cd "$workdir" && git pull)
done

echo ""
echo "========================================"
echo "Finished pulling all repositories"
echo "========================================"
```
- git-pull-all.bat
```
@echo off
echo Running git pull on all subdirectories...

REM Loop through all subdirectories recursively
for /d /r %%i in (*) do (
    REM Check if the directory contains a .git folder
    if exist "%%i\.git" (
        echo.
        echo ========================================
        echo Pulling latest changes in: %%i
        echo ========================================
        cd /d "%%i"
        git pull
    )
)

echo.
echo ========================================
echo Finished pulling all repositories
echo ========================================
pause
```

### git-pull-all-safes
- git-pull-all-safe.sh
```bash
#!/bin/bash

echo "Running git pull on all subdirectories..."

# Find all .git directories recursively and cd to their parent to run git pull
find . -name ".git" -type d | while read gitdir; do
    # Extract the parent directory of the .git folder
    workdir=$(dirname "$gitdir")
    
    echo ""
    echo "========================================"
    echo "Checking repository: $workdir"
    echo "========================================"
    
    # Change to the repository directory
    (
        cd "$workdir"
        
        # Check if there are uncommitted changes
        if ! git diff-index --quiet HEAD -- || [ -n "$(git ls-files --exclude-standard --others)" ]; then
            echo "Warning: Uncommitted changes detected in $workdir"
            echo "Skipping git pull for this repository"
            echo "To manually pull, run: cd $workdir && git pull"
        else
            echo "Pulling latest changes in: $workdir"
            git pull
        fi
    )
done

echo ""
echo "========================================"
echo "Finished checking all repositories"
echo "========================================"
```

- git-pull-all-safe.bat
```bat
@echo off
echo Running git pull on all subdirectories...

REM Loop through all subdirectories recursively
for /d /r %%i in (*) do (
    REM Check if the directory contains a .git folder
    if exist "%%i\.git" (
        echo.
        echo ========================================
        echo Checking repository: %%i
        echo ========================================
        
        cd /d "%%i"
        
        REM Check if there are uncommitted changes
        git diff-index --quiet HEAD -- >nul 2>&1
        if errorlevel 1 (
            echo Warning: Uncommitted changes detected in %%i
            echo Skipping git pull for this repository
            echo To manually pull, run: cd %%i && git pull
        ) else (
            REM Check for untracked files
            git ls-files --exclude-standard --others | findstr . >nul 2>&1
            if errorlevel 1 (
                echo Pulling latest changes in: %%i
                git pull
            ) else (
                echo Warning: Untracked files detected in %%i
                echo Skipping git pull for this repository
                echo To manually pull, run: cd %%i && git pull
            )
        )
    )
)

echo.
echo ========================================
echo Finished checking all repositories
echo ========================================
pause
```

### git-pull-remote-favor
- git-pull-remote-favor.sh
```bash
#!/bin/bash

echo "Running git pull on all subdirectories (favoring remote changes)..."

# Find all .git directories recursively and cd to their parent to run git pull
find . -name ".git" -type d | while read gitdir; do
    # Extract the parent directory of the .git folder
    workdir=$(dirname "$gitdir")
    
    echo ""
    echo "========================================"
    echo "Processing repository: $workdir"
    echo "========================================"
    
    # Change to the repository directory
    (
        cd "$workdir"
        
        # Check if there are any changes to stash
        if ! git diff-index --quiet HEAD -- || [ -n "$(git ls-files --exclude-standard --others)" ]; then
            echo "Uncommitted changes detected, stashing..."
            git stash push -m "Auto stash before git pull ($(date))"
            stashed=true
        else
            stashed=false
        fi
        
        # Perform git pull
        echo "Pulling latest changes in: $workdir"
        git pull
        
        # Restore stashed changes if we stashed any, but favor remote changes on conflict
        if [ "$stashed" = true ]; then
            echo "Restoring stashed changes (favoring remote changes on conflict)..."
            if ! git stash pop; then
                echo "Conflict detected. Favoring remote changes and discarding local stash..."
                # Abort the merge conflict
                git merge --abort 2>/dev/null
                git rebase --abort 2>/dev/null
                
                # Drop the stash since we're discarding local changes
                git stash drop
                
                echo "Remote changes kept. Local stash discarded."
            else
                echo "Stashed changes successfully applied"
            fi
        fi
    )
done

echo ""
echo "========================================"
echo "Finished processing all repositories"
echo "========================================"
```

- git-pull-remote-favor.bat
```bat
@echo off
echo Running git pull on all subdirectories (favoring remote changes)...

REM Loop through all subdirectories recursively
for /d /r %%i in (*) do (
    REM Check if the directory contains a .git folder
    if exist "%%i\.git" (
        echo.
        echo ========================================
        echo Processing repository: %%i
        echo ========================================
        
        cd /d "%%i"
        
        REM Check if there are any changes to stash
        git diff-index --quiet HEAD -- >nul 2>&1
        set stashed=false
        
        if errorlevel 1 (
            echo Uncommitted changes detected, stashing...
            git stash push -m "Auto stash before git pull"
            set stashed=true
        ) else (
            REM Check for untracked files
            git ls-files --exclude-standard --others | findstr . >nul 2>&1
            if errorlevel 0 (
                echo Uncommitted changes detected, stashing...
                git stash push -m "Auto stash before git pull"
                set stashed=true
            )
        )
        
        REM Perform git pull
        echo Pulling latest changes in: %%i
        git pull
        
        REM Restore stashed changes if we stashed any, but favor remote changes on conflict
        if "%stashed%"=="true" (
            echo Restoring stashed changes (favoring remote changes on conflict)...
            git stash pop
            if errorlevel 1 (
                echo Conflict detected. Favoring remote changes and discarding local stash...
                REM Abort any merge/rebase that might be in progress
                git merge --abort >nul 2>&1
                git rebase --abort >nul 2>&1
                
                REM Drop the stash since we're discarding local changes
                git stash drop
                
                echo Remote changes kept. Local stash discarded.
            ) else (
                echo Stashed changes successfully applied
            )
        )
    )
)

echo.
echo ========================================
echo Finished processing all repositories
echo ========================================
pause
```

### git-pull-auto-remote
- git-pull-auto-remote.sh
```bash
#!/bin/bash

echo "Running git pull on all subdirectories (auto-resolving conflicts to favor remote)..."
echo "WARNING: Local changes will be discarded where conflicts occur!"
echo "警告：发生冲突时本地更改将被丢弃！"

# Find all .git directories recursively and cd to their parent to run git pull
find . -name ".git" -type d | while read gitdir; do
    # Extract the parent directory of the .git folder
    workdir=$(dirname "$gitdir")
    
    echo ""
    echo "========================================"
    echo "Processing repository: $workdir"
    echo "========================================"
    
    # Change to the repository directory
    (
        cd "$workdir"
        
        # Check if there are any changes to stash
        if ! git diff-index --quiet HEAD -- || [ -n "$(git ls-files --exclude-standard --others)" ]; then
            echo "Uncommitted changes detected, stashing..."
            git stash push -m "Auto stash before git pull ($(date))"
            has_stash=1
        else
            has_stash=0
        fi
        
        # Perform git pull
        echo "Pulling latest changes in: $workdir"
        git pull
        
        # Restore stashed changes if we stashed any, but resolve conflicts in favor of remote
        if [ $has_stash -eq 1 ]; then
            echo "Restoring stashed changes..."
            if ! git stash pop; then
                echo "Conflicts detected. Resolving in favor of remote changes..."
                
                # Cancel any ongoing merge/rebase
                git merge --abort 2>/dev/null || true
                git rebase --abort 2>/dev/null || true
                
                # Reset the index and working tree to match the remote branch
                # This discards local changes and keeps remote ones
                git reset --hard HEAD
                
                echo "Repository reset to remote state. Local changes discarded."
            else
                echo "Stashed changes successfully applied"
            fi
            
            # Clean up the stash entry
            git stash drop 2>/dev/null || true
        fi
    )
done

echo ""
echo "========================================"
echo "Finished processing all repositories"
echo "========================================"
```

- git-pull-auto-remote.bat
```bat
@echo off
echo Running git pull on all subdirectories (auto-resolving conflicts to favor remote)...
echo WARNING: Local changes will be discarded where conflicts occur!
echo "警告：发生冲突时本地更改将被丢弃！"

REM Loop through all subdirectories recursively
for /d /r %%i in (*) do (
    REM Check if the directory contains a .git folder
    if exist "%%i\.git" (
        echo.
        echo ========================================
        echo Processing repository: %%i
        echo ========================================
        
        cd /d "%%i"
        
        REM Check if there are any changes to stash
        git diff-index --quiet HEAD -- >nul 2>&1
        set has_stash=0
        
        if errorlevel 1 (
            echo Uncommitted changes detected, stashing...
            git stash push -m "Auto stash before git pull"
            set has_stash=1
        ) else (
            REM Check for untracked files
            git ls-files --exclude-standard --others | findstr . >nul 2>&1
            if errorlevel 0 (
                echo Uncommitted changes detected, stashing...
                git stash push -m "Auto stash before git pull"
                set has_stash=1
            )
        )
        
        REM Perform git pull
        echo Pulling latest changes in: %%i
        git pull
        
        REM Restore stashed changes if we stashed any, but resolve conflicts in favor of remote
        if "%has_stash%"=="1" (
            echo Restoring stashed changes...
            git stash pop
            if errorlevel 1 (
                echo Conflicts detected. Resolving in favor of remote changes...
                
                REM Cancel any ongoing merge/rebase
                git merge --abort >nul 2>&1
                git rebase --abort >nul 2>&1
                
                REM Reset the index and working tree to match the remote branch
                REM This discards local changes and keeps remote ones
                git reset --hard HEAD
                
                echo Repository reset to remote state. Local changes discarded.
            ) else (
                echo Stashed changes successfully applied
            )
            
            REM Clean up the stash entry
            git stash drop >nul 2>&1
        )
    )
)

echo.
echo ========================================
echo Finished processing all repositories
echo ========================================
pause
```

## 一些错误的解决方案
> Git command returns fatal error: "detected dubious ownership"
> fatal: unsafe repository(XXXX is owned by someone else.)
```shell
# windows:
takeown /r /d y /f <PATH>
# linux:
chown -R username:group <PATH>

# 或者忽略全部文件夹
git config --global --add safe.directory "*"
```

> Filename too long.
```shell
git config --global core.longpaths true
```




Git 笔记

## CentOS 7 网络配置

```shell
# 网络配置
sed -i 's/ONBOOT="no"/ONBOOT="yes"/g' /etc/sysconfig/network-scripts/ifcfg-eth0
sed -i 's/IPV6INIT="yes"/IPV6INIT="no"/g' /etc/sysconfig/network-scripts/ifcfg-eth0
sed -i 's/BOOTPROTO="dhcp"/BOOTPROTO="none"/g' /etc/sysconfig/network-scripts/ifcfg-eth0

sed -i 's/ONBOOT=no/ONBOOT=yes/g' /etc/sysconfig/network-scripts/ifcfg-eth0
sed -i 's/IPV6INIT=yes/IPV6INIT=no/g' /etc/sysconfig/network-scripts/ifcfg-eth0
sed -i 's/BOOTPROTO=dhcp/BOOTPROTO=none/g' /etc/sysconfig/network-scripts/ifcfg-eth0

cat << EOF >> /etc/sysconfig/network-scripts/ifcfg-eth0
IPADDR=192.168.2.23
PREFIX=16
GATEWAY=192.168.1.1
DNS1=114.114.114.114
DNS2=192.168.1.1
EOF
cat << EOF >/etc/hostname
QRadarCE
EOF
```

## CentOS 7 安装必备包

```shell
# 必备软件
yum install -y epel-release
yum update -y
yum install -y bash-completion bash-completion-extras sudo openssh-server
systemctl enable sshd
systemctl start sshd
ln -s -f /usr/share/zoneinfo/Asia/Shanghai /etc/localtime
reboot
```



## CentOS 6 安装必备包

```shell
mv /etc/yum.repos.d/CentOS-Base.repo /etc/yum.repos.d/CentOS-Base.repo.backup
curl -o /etc/yum.repos.d/CentOS-Base.repo https://mirrors.aliyun.com/repo/Centos-vault-6.10.repo
yum clean all && yum makecache
yum install -y epel-release
yum update -y
yum install -y bash-completion bash-completion-extras sudo openssh-server
echo "PermitRootLogin yes" | tee /etc/ssh/sshd_config

ssh-keygen -t rsa -f /etc/ssh/ssh_host_rsa_key
ssh-keygen -t dsa -f /etc/ssh/ssh_host_dsa_key
ssh-keygen -t ecdsa -f /etc/ssh/ssh_host_ecdsa_key
ssh-keygen -t ed25519 -f /etc/ssh/ssh_host_ed25519_key

chkconfig sshd on
service sshd start
ln -s -f /usr/share/zoneinfo/Asia/Shanghai /etc/localtime
```

## Extra Packages for Enterprise Linux (EPEL)

```shell
yum install -y epel-release
```

## ELRepo Project

Import the public key:  
```shell
rpm --import https://www.elrepo.org/RPM-GPG-KEY-elrepo.org
```

To install ELRepo for RHEL-9:  
```bash
yum install https://www.elrepo.org/elrepo-release-9.el9.elrepo.noarch.rpm
```

To install ELRepo for RHEL-8:
```shell
yum install https://www.elrepo.org/elrepo-release-8.el8.elrepo.noarch.rpm
```

To install ELRepo for RHEL-7, SL-7 or CentOS-7:
```shell
yum install https://www.elrepo.org/elrepo-release-7.el7.elrepo.noarch.rpm
```

安装长期支持内核（lt = long time）
```shell
yum --enablerepo=elrepo-kernel -y install kernel-lt
```
安装稳定主线内核kernel-ml（ml=mainline）
```shell
yum --enablerepo=elrepo-kernel -y install kernel-ml
```

### 红帽软件集合

https://access.redhat.com/support/policy/updates/rhscl-rhel7

```shell
yum install centos-release-scl –y
```

安装 GCC 9
```shell
yum install devtoolset-9-toolchain –y
# 临时使用
scl enable devtoolset-9 bash
source scl_source enable devtoolset-9

安装 GCC 7
```shell
yum install devtoolset-7-toolchain –y
# 临时使用
scl enable devtoolset-7 bash
source scl_source enable devtoolset-7
```


安装 Python 3.8
```shell
yum install rh-python38 rh-python38-python-devel –y
# 临时使用
scl enable rh-python38 bash
source scl_source enable rh-python38
```

## MySQL Server 5.7
```shell
yum install -y http://repo.mysql.com/mysql57-community-release-el7.rpm
rpm -import http://repo.mysql.com/RPM-GPG-KEY-mysql-2022

yum install mysql-server -y

systemctl enable mysqld
systemctl start mysqld

grep 'temporary password'  /var/log/mysqld.log
```

## MySQL Server 8.0
```shell
yum install -y https://repo.mysql.com/mysql80-community-release-el7.rpm
rpm -import http://repo.mysql.com/RPM-GPG-KEY-mysql-2022

yum install mysql-server -y

systemctl enable mysqld
systemctl start mysqld

grep 'temporary password'  /var/log/mysqld.log
```

## Nginx
```shell
yum install -y https://nginx.org/packages/centos/7/noarch/RPMS/nginx-release-centos-7-0.el7.ngx.noarch.rpm
yum install -y nginx
systemctl enable nginx
systemctl start nginx
```

## Redis 3.2
```shell
yum install -y redis
systemctl enable redis
systemctl start redis
```

## Redis 6
```shell
yum install -y \
https://repo.ius.io/ius-release-el7.rpm \
https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm
yum install -y redis6
systemctl enable redis
systemctl start redis
```

## OpenJDK
```shell
# openjdk 8
yum install -y java-1.8.0-openjdk java-1.8.0-openjdk-devel

# openjdk 11
yum install -y java-11-openjdk java-11-openjdk-devel
```

CentOS 笔记

## AliYun
```bash
# 卸载云盾（安骑士）
curl http://update.aegis.aliyun.com/download/uninstall.sh | bash
curl http://update.aegis.aliyun.com/download/quartz_uninstall.sh | bash

sudo rm -r /usr/local/aegis
sudo systemctl disable aliyun.service
sudo rm /usr/sbin/aliyun-service
sudo rm /usr/sbin/aliyun-service.backup
sudo rm /usr/sbin/aliyun_installer
sudo rm /etc/systemd/system/aliyun.service
sudo rm /lib/systemd/system/aliyun.service

# 卸载云助手Agent
/usr/local/share/assist-daemon/assist_daemon --stop
/usr/local/share/assist-daemon/assist_daemon --delete
rm -rf /usr/local/share/assist-daemon

systemctl stop aliyun.service
apt remove  aliyun-assist -y
dpkg -l |grep "^rc"|awk '{print $2}'|sudo xargs apt -y purge
rm -rf /usr/local/share/aliyun-assist
```

>云监控

```bash
# 卸载云监控 Go 语言版
# 停止
/usr/local/cloudmonitor/CmsGoAgent.linux-* stop
# 从系统服务中移除
/usr/local/cloudmonitor/CmsGoAgent.linux-* uninstall

# 卸载
/usr/local/cloudmonitor/CmsGoAgent.linux-* stop && \
/usr/local/cloudmonitor/CmsGoAgent.linux-* uninstall && \
rm -rf /usr/local/cloudmonitor

# 卸载云监控 Java 版
# 停止
/usr/local/cloudmonitor/wrapper/bin/cloudmonitor.sh stop

# 卸载
/usr/local/cloudmonitor/wrapper/bin/cloudmonitor.sh remove && \
rm -rf /usr/local/cloudmonitor
```


## QCloud
```bash
/usr/local/qcloud/stargate/admin/stop.sh
/usr/local/qcloud/YunJing/stopYDCore.sh
/usr/local/qcloud/monitor/barad/admin/stop.sh

/usr/local/qcloud/stargate/admin/uninstall.sh
/usr/local/qcloud/YunJing/uninst.sh
/usr/local/qcloud/monitor/barad/admin/uninstall.sh
rm -rf /usr/local/qcloud
```

卸载云服务监控

# Ubuntu

### 客户端
```bash
# 配置免密登录
ssh-copy-id root@uing.vip
```
### 服务器
```bash
apt update && apt -o Dpkg::Options::="--force-confnew" full-upgrade -y && apt autoremove -y
apt install -y curl htop vim ufw sudo bash-completion

cat >> /etc/security/limits.conf << EOF
# End of file
*     soft   nofile    655360
*     hard   nofile    655360
*     soft   nproc     655360
*     hard   nproc     655360
*     soft   core      655360
*     hard   core      655360
*     hard   memlock   unlimited
*     soft   memlock   unlimited
EOF

cat >> /etc/sysctl.conf << EOF
net.core.rmem_max=33554432
net.core.wmem_max=33554432
net.core.default_qdisc=fq
net.ipv4.tcp_congestion_control=bbr
EOF
sysctl -p

cat > /etc/hostname << EOF
uing.vip
EOF
cat >> /etc/hosts << EOF
127.0.1.1 uing.vip
EOF

# 设置上海时区
ln -s -f /usr/share/zoneinfo/Asia/Shanghai /etc/localtime
timedatectl set-timezone Asia/Shanghai

# 防火墙配置
ufw default deny
ufw allow ssh
ufw allow http
ufw allow https
ufw allow 443/udp
ufw enable

# 重启
reboot

# Certbot HTTPS 证书安装续订
apt install -y certbot
certbot certonly --standalone --agree-tos --register-unsafely-without-email -d uing.vip
```

## 安装 Docker
```bash
curl https://get.docker.com/ | sh
ln -s /usr/libexec/docker/cli-plugins/docker-compose /usr/local/bin/docker-compose
# 更方便使用 docker exec 命令
sudo tee /usr/local/bin/dssh > /dev/null << EOF
#!/bin/sh
docker exec -it \$1 sh
EOF
sudo chmod a+x /usr/local/bin/dssh

# 让 Docker 支持 IPv6
sudo tee /etc/docker/daemon.json > /dev/null << EOF
{
  "ipv6": true,
  "fixed-cidr-v6": "2001:db8:1::/64",
  "experimental": true,
  "ip6tables": true
}
EOF
sudo systemctl restart docker

# 创建 Docker VPS 容器网络
docker network create \
  --driver=bridge \
  --subnet=172.16.1.0/24 \
  --ip-range=172.16.1.0/24 \
  --gateway=172.16.1.1 \
  vps

# 支持 IPv6
docker network create \
  --driver=bridge \
  --ipv6 \
  --subnet=172.16.1.0/24 \
  --ip-range=172.16.1.0/24 \
  --gateway=172.16.1.1 \
  --subnet=2001:0DB8::1:0/112 \
  --ip-range2001:0DB8::1:0/112 \
  --gateway=2001:db8::1:1 \
  vps
```

初始化 VPS

## SPEEDTEST CLI 网速测试

### macOS
```bash
brew tap teamookla/speedtest
brew update
# Example how to remove conflicting or old versions using brew
# brew uninstall speedtest --force
# brew uninstall speedtest-cli --force
brew install speedtest --force
```

### Ubuntu/Debian
```bash
## If migrating from prior bintray install instructions please first...
# sudo rm /etc/apt/sources.list.d/speedtest.list
# sudo apt-get update
# sudo apt-get remove speedtest
## Other non-official binaries will conflict with Speedtest CLI
# Example how to remove using apt-get
# sudo apt-get remove speedtest-cli
sudo apt-get update
sudo apt-get install -y curl
curl -s https://packagecloud.io/install/repositories/ookla/speedtest-cli/script.deb.sh | sudo bash
sudo apt-get install -y speedtest
```

### Fedora/Centos/Redhat
```bash
## If migrating from prior bintray install instructions please first...
# sudo rm /etc/yum.repos.d/bintray-ookla-rhel.repo
# sudo yum remove speedtest
## Other non-official binaries will conflict with Speedtest CLI
# Example how to remove using yum
# rpm -qa | grep speedtest | xargs -I {} sudo yum -y remove {}
curl -s https://packagecloud.io/install/repositories/ookla/speedtest-cli/script.rpm.sh | sudo bash
sudo yum install speedtest
```

## 本地到服务器测试
```bash
docker run -d --name looking-glass --restart always -p 8888:80 wikihostinc/looking-glass-server
# 本地浏览器访问 http://IP:8888

# 测试结束后
docker stop looking-glass
docker rm looking-glass
```