# Git Basic Notes ## Git Configuration - /etc/gitconfig - ~/.gitconfig 或 ~/.config/git/config - repo/.git/config ### Basic Configuration ```bash git config --global user.name "sabertazimi" git config --global user.email sabertazimi@gmail.com git config --global core.autocrlf false git config --global core.editor vim git config --global credential.helper store git config --global color.ui true ``` ```bash git config --global commit.template $HOME/.GitCommit.md git config --global commit.gpgsign true git config --global user.signingkey git config --global push.default simple git config --global merge.conflictstyle diff3 git config --global pull.rebase true git config --global rebase.autoStash true ``` ```bash # after 1s, git auto correct wrong command git config --global help.autocorrect 10 ``` ### Proxy Configuration - github.com.cnpmjs.org - hub.fastgit.org - raw.fastgit.org ```bash # speed up by cnpmjs # git clone/push/pull works git config --global url."https://github.com.cnpmjs.org/".insteadOf "https://github.com/" # post buffer config git config --global http.postbuffer 524288000 git config --global http.postbuffer 1048576000 # proxy git config --global http.proxy 'socks5://127.0.0.1:1080' git config --global https.proxy 'socks5://127.0.0.1:1080' ``` ### List and Help ```bash git config --list git --help man git- git help git help config ``` ## File State - Untracked - Unmodified(**Stable State**) - Modified - Staged ## Git Ignore File 文件 .gitignore 的格式规范如下： - 所有空行或者以＃开头的行都会被 Git 忽略 - 可以使用标准的 glob 模式(简化正则表达式)匹配 - 匹配模式可以以（ / ）开头防止递归 - 匹配模式可以以（ / ）结尾指定目录 - 要跟踪指定模式以外的文件或目录，可以在模式前加上惊叹号（ ! ）取反 - [GitHub gitignore Style](https://github.com/github/gitignore) ```bash # no .a files *.a # but do track lib.a, even though you're ignoring .a files above !lib.a # only ignore the TODO file in the current directory, not subDir/TODO /TODO # ignore all files in the build/ directory build/ # ignore doc/notes.txt, but not doc/server/arch.txt doc/*.txt # ignore all .pdf files in the doc/ directory doc/**/*.pdf ``` ## Diff 查看未暂存(un-staged)差异 ```bash git diff ``` 查看已暂存(staged)差异 ```bash git diff --staged ``` 显示空白字符错误(space/tab/return) ```bash git diff --check ``` ## Add - 交互式的选择 add 特定部分 ```bash git add -p ``` ## Commit - -a: 跳过暂存阶段(git add) - -v: 显示详细 diff 信息 ```bash git commit -a -v ``` 重新提交 ```bash git commit --amend -a -v ``` ### Commit Style Guide - [Conventional Commits Specification](https://github.com/conventional-commits/conventionalcommits.org) - [Commit Lint](https://github.com/conventional-changelog/commitlint) - [Commitizen: Conventional commits CLI tool](https://github.com/commitizen/cz-cli) - [Standard Version: Automate versioning and CHANGELOG generation](https://github.com/conventional-changelog/standard-version) ```bash npm i -D standard-version ``` ```bash npx commitizen init cz-conventional-changelog --save-dev --save-exact ``` ```md (): (emptyLine) (emptyLine)