git命令-笔记

1 下载地址

Windows版本：https://git-scm.com/download/win

Git-2.29.1-64-bit.exe 2.29.1

2 相关命令

2.1 基本

git init 初始化代码仓库
git status 查询仓库索引状态
git add <文件名/目录> 添加文件到仓库
git config --global user.email “you@example.com” 配置全局的提交者邮箱
git config --global user.name “Your Name” 配置全局的提交者名字
git commit -m “add component to project " --author=” Your Name < you@example.com>" 提交暂存内容（不带文件名的提交）
git commit somefile 提交修改后的文件（原先已经add/commit过）
git config --global core.editor gedit 设置提交时编辑变更信息的编辑器
git log 查看提交记录
git log --graph --pretty=oneline --abbrev-commit
git show <提交码> 查看某次提交详细的变更信息
git show-branch --more=n 查看简洁的单行提交信息
git diff <提交码> <提交码> 查看两个提交之间的差异
git rm <文件名> 删除文件 （需要进一步git commit）
git rm -r <文件夹> 删除文件夹（需要进一步git commit）
git mv <source文件> <Target文件> 重命名
git clone 创建版本库的符本
git config –l 列出配置
git config –unset 移除设置
git reset ––hard 将版本库和工作目录改变为已知状态
git rev-parse <提交> 查看提交标识

2.2 检出

git checkout HEAD – <文件> 恢复文件的旧版本
git checkout HEAD – <文件夹>恢复文件的旧版本
git checkout <分支名> 检出分支并切换到分支

gitk 版本库的可视化

2.3 分支

git branch 列出分支名
git show-branch 显示分支
git branch <分支> <提交> 创建一个分支，弱不包含提交，则标识从当前分支的HEAD创建一个新的分支
git checkout <分支名> 检出分支
git checkout –b <分支名> 检出新分支，并切换到分支
git branch –d <分支名> 删除分支

2.4 diff

git diff 比较工作目录和索引之间的差异
git diff 显示工作目录和给定提交间的差异
git diff 比较两个提交的差异
git diff --cached 显示索引中的变更和给定提交的变更间的差异

2.5 合并

git merge <分支名> 合并分支

2.6 更改提交

git reset --hard HEAD 把工作目录和索引都还原到git merge命令之前
git reset --hard ORIG_HEAD 若合并并提交后想放弃，则需要使用这条命令进行还原到合并前。Git把原始分支的HEAD 保存在ORIG_HEAD
git reset --soft 将HEAD引用指向给定提交。索引和工作目录的内容保持不变。
git reset --mixed 将HEAD指向给定提交，索引内容也跟着改变以符合给定提交的树结构，但是工作目录中的内容保持不变
git reset --hard将HEAD引用指向给定提交，索引的内容也跟着改变以扶额和给定提交的树结构，工作目录的内容也随之改变以反映给定提交表示的树的状态。
git reset HEAD <文件> 撤回暂存

git reset --mixed HEAD^ 退回上一次提交

git cherry-pick <提交> 在当前分支上应用 给定提交引入的变更。一般合并其他分支上的特定版本的一次变更（如修复某个bug）
git revert <提交> 引入一个新提交来抵消给定提交的影响。常见用途为：如某个提交有缺陷，用来撤销那次提交的变更内容，从而去除那次变更引入的问题。

3 命令选项

3.1 git commit

usage: git commit [] [–] …

-q, --quiet           suppress summary after successful commit
-v, --verbose         show diff in commit message template

Commit message options
-F, --file read message from file
–author override author for commit
–date override date for commit
-m, --message
commit message
-c, --reedit-message
reuse and edit message from specified commit
-C, --reuse-message
reuse message from specified commit
–fixup use autosquash formatted message to fixup specified commit
–squash use autosquash formatted message to squash specified commit
–reset-author the commit is authored by me now (used with -C/-c/–amend)
-s, --signoff add Signed-off-by:
-t, --template
use specified template file
-e, --edit force edit of commit
–cleanup how to strip spaces and #comments from message
–status include status in commit message template
-S, --gpg-sign[=]
GPG sign commit

Commit contents options
-a, --all commit all changed files
-i, --include add specified files to index for commit
–interactive interactively add files
-p, --patch interactively add changes
-o, --only commit only specified files
-n, --no-verify bypass pre-commit and commit-msg hooks
–dry-run show what would be committed
–short show status concisely
–branch show branch information
–ahead-behind compute full ahead/behind values
–porcelain machine-readable output
–long show status in long format (default)
-z, --null terminate entries with NUL
–amend amend previous commit
–no-post-rewrite bypass post-rewrite hook
-u, --untracked-files[=]
show untracked files, optional modes: all, normal, no. (Default: all)
–pathspec-from-file
read pathspec from file
–pathspec-file-nul with --pathspec-from-file, pathspec elements are separated with NUL character

3.2 git checkout

usage: git checkout []
or: git checkout [] [] – …

-b <branch>           create and checkout a new branch
-B <branch>           create/reset and checkout a branch
-l                    create reflog for new branch
--guess               second guess 'git checkout <no-such-branch>' (default)
--overlay             use overlay mode (default)
-q, --quiet           suppress progress reporting
--recurse-submodules[=<checkout>]
                      control recursive updating of submodules
--progress            force progress reporting
-m, --merge           perform a 3-way merge with the new branch*
--conflict <style>    conflict style (merge or diff3)
-d, --detach          detach HEAD at named commit
-t, --track           set upstream info for new branch
-f, --force           force checkout (throw away local modifications)
--orphan <new-branch>
                      new unparented branch
--overwrite-ignore    update ignored files (default)
--ignore-other-worktrees
                      do not check if another worktree is holding the given ref
-2, --ours            checkout our version for unmerged files
-3, --theirs          checkout their version for unmerged files
-p, --patch           select hunks interactively
--ignore-skip-worktree-bits
                      do not limit pathspecs to sparse entries only
--pathspec-from-file <file>
                      read pathspec from file
--pathspec-file-nul   with --pathspec-from-file, pathspec elements are separated with NUL character

3.3 git branch

usage: git branch [] [-r | -a] [–merged] [–no-merged]
or: git branch [] [-l] [-f] []
or: git branch [] [-r] (-d | -D) …
or: git branch [] (-m | -M) []
or: git branch [] (-c | -C) []
or: git branch [] [-r | -a] [–points-at]
or: git branch [] [-r | -a] [–format]

Generic options
-v, --verbose show hash and subject, give twice for upstream branch
-q, --quiet suppress informational messages
-t, --track set up tracking mode (see git-pull(1))
-u, --set-upstream-to
change the upstream info
–unset-upstream unset the upstream info
–color[=] use colored output
-r, --remotes act on remote-tracking branches
–contains print only branches that contain the commit
–no-contains
print only branches that don’t contain the commit
–abbrev[=] use digits to display object names

Specific git-branch actions:
-a, --all list both remote-tracking and local branches
-d, --delete delete fully merged branch
-D delete branch (even if not merged)
-m, --move move/rename a branch and its reflog
-M move/rename a branch, even if target exists
-c, --copy copy a branch and its reflog
-C copy a branch, even if target exists
-l, --list list branch names
–show-current show current branch name
–create-reflog create the branch’s reflog
–edit-description edit the description for the branch
-f, --force force creation, move/rename, deletion
–merged print only branches that are merged
–no-merged print only branches that are not merged
–column[=