-
CREATE 创建命令:
Clone an existing repository 克隆现有仓库:
$ git clone ssh://user@domain.com/repo.git
Create a new local repository 创建一个新的本地仓库:
$ git init
-
LOCAL CHANGES 本地操作:
Changed files in your working directory 查看工作中已经更改的目录:
$ git status
Changes to tracked files 对跟踪文件的更改:
$ git diff
Add all current changes to the next commit 将所有当前更改添加到下一次提交:
$ git add .
Add some changes in <file> to the next commit 将<file>中的一些更改添加到下一次提交:
$ git add -p <file>
Commit all local changes in tracked files 提交所有本地更改:
$ git commit -a
Commit previously staged changes 分段提交更改(类似于快照)
$ git commit
Change the last commit
Don‘t amend published commits!
$ git commit --amend
- COMMIT HISTORY 提交历史:
Show all commits, starting with newest
$ git log
Show changes over time for a specific file
$ git log -p <file>
Who changed what and when in <file>
$ git blame <file>
BRANCHES & TAGS
List all existing branches
$ git branch -av
Switch HEAD branch
$ git checkout <branch>
Create a new branch based
on your current HEAD
$ git branch <new-branch>
Create a new tracking branch based on
a remote branch
$ git checkout --track <remote/branch>
Delete a local branch
$ git branch -d <branch>
Mark the current commit with a tag
$ git tag <tag-name>
- UPDATE & PUBLISH 更新和发布:
List all currently configured remotes
$ git remote -v
Show information about a remote
$ git remote show <remote>
Add new remote repository, named <remote>
$ git remote add <shortname> <url>
Download all changes from <remote>,
but don‘t integrate into HEAD
$ git fetch <remote>
Download changes and directly
merge/integrate into HEAD
$ git pull <remote> <branch>
Publish local changes on a remote
$ git push <remote> <branch>
Delete a branch on the remote
$ git branch -dr <remote/branch>
Publish your tags
$ git push --tags
-
MERGE & REBASE 合并 和 变基:
Merge <branch> into your current HEAD
$ git merge <branch>
Rebase your current HEAD onto <branch>
Don‘t rebase published commits!
$ git rebase <branch>
Abort a rebase
$ git rebase --abort
Continue a rebase after resolving conflicts
$ git rebase --continue
Use your configured merge tool to
solve conflicts
$ git mergetool
Use your editor to manually solve conflicts
and (after resolving) mark file as resolved
$ git add <resolved-file>
$ git rm <resolved-file>
-
UNDO 撤销:
Discard all local changes in your working
directory
$ git reset --hard HEAD
Discard local changes in a specific file
$ git checkout HEAD <file>
Revert a commit (by producing a new commit
with contrary changes)
$ git revert <commit>
Reset your HEAD pointer to a previous commit
…and discard all changes since then
$ git reset --hard <commit>
…and preserve all changes as unstaged
changes
$ git reset <commit>
…and preserve uncommitted local changes
$ git reset --keep <commit>
为分支添加备注
添加备注
D:\www\yunbao_vip>git config branch.424dev.description 分支备注信息 注:424dev是分支名
查看备注2中方法:
方法1使用 git br,安装 git-br: npm i -g git-br
git br
* master
424dev 分支备注信息
方法2使用命令 git config branch.分支名.description
D:\www\yunbao_vip>git config branch.424dev.description
分支备注信息