# base config
alias see="ps -ef|grep"
alias rl="source ~/.bashrc"
alias bashconf="code ~/.bashrc"
alias gitconf="code ~/.gitconfig"
alias npmconf="code ~/.npmrc"
alias yarnconf="code ~/.yarnrc"
alias as="cat ~/.bashrc"
alias asg="cat ~/.bashrc | grep"

# git config
alias gs="git status"
alias gl="git log --graph --pretty=format:'%Cred%h%Creset q-%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit  "
alias glo="git log --oneline"
alias gb="git branch"
alias gtn="git tag -n"
alias grtv="git remote -v"
alias ga="git add ."
alias gac="git add . && git commit -m"
alias gaca="git add . && git commit --amend"
alias gacan="git add . && git commit --amend --no-edit"
alias gc="git commit"
alias gca="git commit --amend"
alias gcan="git commit --amend --no-edit"
alias gct="git checkout"
alias gcp="git cherry-pick"
alias gpl="git pull"
alias gp="git push"
alias grs='git restore'
alias grst='git restore --staged'
alias gbranch="git fetch -p"
alias gtag="git fetch -P"
alias gtng="git tag -n | grep"

alias conf="git config --list"
alias confl="git config --local --list"
alias confg="git config --global --list"
alias reset="git reset HEAD"
alias reset!="git reset --hard HEAD"
alias reset1="git reset HEAD~1"
alias reset1!="git reset --hard HEAD~1"
alias clone="git clone"
alias restore="git restore ."

alias rdiff1="git status | grep modified | awk '{print \$2}' > _diff-temp-list.txt"
alias rdiff2="mkdir ./_diff-temp"
alias rdiff3="xargs -a ./_diff-temp-list.txt cp --parents -t ./_diff-temp"
# alias rdiff="rdiff1 && rdiff2 && rdiff3"
alias rdiff="git archive --format=zip -o diff-temp.zip HEAD \$(git diff --name-only HEAD^)"

# project simple
alias cls="clear"
alias ..="cd .."
alias ...="cd ../.."
alias ....="cd ../../.."

# npm
alias docs="npm docs"
alias repo="npm repo"

# tk
alias unproxy="git config --global --unset http.proxy && git config --global --unset https.proxy"
alias proxy="git config --global http.proxy http://127.0.0.1:1081 && git config --global https.proxy https://127.0.0.1:1081"

alias my="git config user.name Asplitline && git config user.email *@qq.com"
alias cmy="git config user.name tink && git config user.email tink@tink.com"
alias clsmy="git config --unset user.name && git config --unset user.email"

source ~/.bash_profile

# 命令行获取 git路径
where git

# settings.json中配置
# "git.path": "D:\\git\\Git\\cmd\\git.exe" # 可选
"terminal.integrated.shell.windows": "D:\\git\\Git\\bin\\bash.exe"

"terminal.integrated.defaultProfile.windows": "bash",
"terminal.integrated.profiles.windows": {
  "bash": {
    "path": "D:\\Git\\bin\\bash.exe",
    "args": []
  }
},

ssh-keygen -t rsa -b 4096 -C "<comment-info>"

# 密钥文件
<key_file>.pub
<key_file>

Host github.com
    HostName github.com
    IdentityFile ~/.ssh/<key_file>
    User <dev_name>
# 也可以配置多个密钥
Host codeup1.aliyun.com
    HostName codeup1.aliyun.com
    IdentityFile ~/.ssh/<key_file>
    User <dev_name>

ssh -T git@github.com

echo .history >> ~/.gitignore

git config --global core.excludesfile ~/.gitignore

// 文件列表不显示 .history
"files.exclude": {
   "**/.history": true,
 },
// 搜索不显示 .history
 "search.useGlobalIgnoreFiles": true,
 "search.useIgnoreFiles": true,
 "search.exclude": {
   "**/.history": true
 }

# 提交时转换为LF，检出时转换为CRLF
git config --global core.autocrlf true

# 提交时转换为LF，检出时不转换
git config --global core.autocrlf input

# 提交检出均不转换
git config --global core.autocrlf false

# 拒绝提交包含混合换行符的文件
git config --global core.safecrlf true

# 允许提交包含混合换行符的文件
git config --global core.safecrlf false

# 提交包含混合换行符的文件时给出警告
git config --global core.safecrlf warn

# 提交检出均不转换
git config --global core.autocrlf false
# git config --global core.autocrlf input

# 允许提交包含混合换行符的文件
git config --global core.safecrlf true

git config --global http.sslCAinfo D:\\git\\Git\\mingw64\\ssl\\certs\\ca-bundle.crt

error: RPC failed; curl 18 transfer closed with outstanding read data remaining
fetch-pack: unexpected disconnect while reading sideband packet
fatal: early EOF
fatal: fetch-pack: invalid index-pack output

git config --global http.postBuffer 524288000

fatal: Custom certificate bundle not found at path: D:/Git/mingw64/ssl/certs/ca-bundle.crt
fatal: Custom certificate bundle not found at path: D:/Git/mingw64/ssl/certs/ca-bundle.crt

git config --global http.sslVerify false

ls ~/.ssh

>>>>
id_rsa  id_rsa.pub

# 抵消上一次提交
git revert HEAD
# 抵消多次提交
git revert [倒数第一个提交] [倒数第二个提交]

# 内容回到暂存区
git reset [last good SHA]

# 内容直接丢弃
git reset --hard [last good SHA]

git commit --amend -m "Fixes bug #42"

git checkout -- [filename]

git rm --cached [filename]

git restore --staged [filename]

# 新建一个 feature 分支，指向当前最新的提交
# 注意，这时依然停留在当前分支
git branch feature

# 切换到这几次提交之前的状态
git reset --hard [当前分支此前的最后一次提交]

# 切换到 feature 分支
git checkout feature

git commit -m "WIP"
git add .
git stash
git reset HEAD^
git stash pop --index 0

1. 首先, 提交全部更新

2. 执行 git rm -r --cached .  # 删除缓存文件，不会删除物理
# -r 循环删除

3. 执行 git add .

4. 执行 git commit -m .  # SourceTree自带推送按钮，这一步命令行可以省略.

git mv Hello.js hello.js

git checkout -b xx # 新建分支
git push # 推送分支
git checkout main
git reset --hard o/main # 回滚
git checkout xx

HEAD detached from refs/heads/test

# refs/heads/test => ca1f3a1

git branch
* (HEAD detached from refs/heads/test)

git branch temp ca1f3a1
git checkout master
git merge temp
git branch -d temp

git rebase -i [hashA] [hashB]

pick a2cca36 feat: a
pick 52e9751 feat: b
pick 623fc96 feat: c
pick 42817be feat: d

Commands:
p, pick
use commit
r, reword
use commit,but edit the commit messagee,edit = use commit, but stop for amending
s, squash
use commit,but meld into previous commit
f, fixup
like "squash", but discard this commit's log messagex,exec = run command (the rest of the line) using shell
d, drop
remove commit

pick a2cca36 feat: a
s 52e9751 feat: b
s 623fc96 feat: c
s 42817be feat: d

git checkout .

git clean

git reset .

fatal: The upstream branch of your current branch does not match
the name of your current branch.  To push to the upstream branch
on the remote, use

    git push origin HEAD:feat/main

To push to the branch of the same name on the remote, use

    git push origin HEAD

To choose either option permanently, see push.default in 'git help config'.

There is no tracking information for the current branch.
Please specify which branch you want to merge with.
See git-pull(1) for details.

    git pull <remote> <branch>

If you wish to set tracking information for this branch you can do so with:

    git branch --set-upstream-to=origin/<branch> feat/main

# 删除 untracked files
git clean -f

# 连 untracked 的目录也一起删掉
git clean -fd
# 连 gitignore 的untrack 文件/目录也一起删掉 （慎用，一般这个是用来删掉编译出来的 .o之类的文件用的）
git clean -xfd

# 在用上述 git clean 前，墙裂建议加上 -n 参数来先看看会删掉哪些文件，防止重要文件被误删
git clean -nxfd
git clean -nf
git clean -nfd

git reflog
ccccccc HEAD@{0}: commit (amend): xxxx
bbbbbbb HEAD@{1}: commit: xxxx

git reset --soft HEAD@{1}

git rebase -i HEAD~N

$ git rebase -i HEAD~3
pick a6976ec6 commit-1
pick 88c985a0 commit-2(error commit)
pick e333375e commit-3

pick a6976ec6 commit-1
edit 88c985a0 commit-2(error commit)
pick e333375e commit-3

git commit --amend --reset-author

git commit --amend -m <new_message>

git commit --amend --date="$(date -R)"

git revert HEAD

git revert [倒数第一个提交] [倒数第二个提交]

git reset <commitHashId>

git commit --amend -m "Fixes bug #42"

git checkout -- [filename]

git rm --cached [filename]

# 新建一个 feature 分支，指向当前最新的提交
# 注意，这时依然停留在当前分支
$ git branch feature

# 切换到这几次提交之前的状态
$ git reset --hard [当前分支此前的最后一次提交]

# 切换到 feature 分支

git tag -l | xargs git tag -d #删除所有本地分支
git fetch origin --prune #从远程拉取所有信息
git branch -a --contains Tag_V1.0.0 # 看看哪个分支包含这个tag/commit

# current branch - main
git pull origin --rebase master

# current branch - main
git checkout master
# current branch - master
git pull origin master
git checkout main
# current branch - main
git rebase master

git remote -v
origin  https://github.com/xxx/xx.git (fetch)
origin  https://github.com/xxx/xx.git (push)
upstream    <repo-url> (fetch)
upstream    <repo-url> (push)

# 添加上游仓库
git remote add upstream <repo-url>
# 修改上游仓库
git remote set-url upstream <repo-url>

git fetch upstream

* master # 本地分支
upstream/master  # 同步后上游仓库分支

sudo vim /etc/hosts

185.199.108.133 raw.githubusercontent.com
185.199.108.133 user-images.githubusercontent.com
185.199.108.133 avatars2.githubusercontent.com
185.199.108.133 avatars1.githubusercontent.com

git branch --merged | grep -v 'master' | xargs git branch -d