常用命令

拉取本仓库远程分支到本地

git fetch origin 分支名
git checkout 分支名 // 拉取到本地但是不切换分支
git checkout -b dev(本地分支名称) origin/dev(远程分支名称) // 将远程分支拉取到本地并切换分支

Configuring a remote for a fork

给 fork 配置一个 remote
主要使用 git remote -v 查看远程状态。

git remote -v
# origin  https://github.com/YOUR_USERNAME/YOUR_FORK.git (fetch)
# origin  https://github.com/YOUR_USERNAME/YOUR_FORK.git (push)

添加一个将被同步给 fork 远程的上游仓库

git remote add upstream https://github.com/ORIGINAL_OWNER/ORIGINAL_REPOSITORY.git

再次查看状态确认是否配置成功。

git remote -v
# origin    https://github.com/YOUR_USERNAME/YOUR_FORK.git (fetch)
# origin    https://github.com/YOUR_USERNAME/YOUR_FORK.git (push)
# upstream  https://github.com/ORIGINAL_OWNER/ORIGINAL_REPOSITORY.git (fetch)
# upstream  https://github.com/ORIGINAL_OWNER/ORIGINAL_REPOSITORY.git (push)

Syncing a fork

从上游仓库 fetch 分支和提交点，传送到本地，并会被存储在一个本地分支 upstream/master
git fetch upstream

git fetch upstream
# remote: Counting objects: 75, done.
# remote: Compressing objects: 100% (53/53), done.
# remote: Total 62 (delta 27), reused 44 (delta 9)
# Unpacking objects: 100% (62/62), done.
# From https://github.com/ORIGINAL_OWNER/ORIGINAL_REPOSITORY
#  * [new branch]      master     -> upstream/master

切换到本地主分支(如果不在的话)
git checkout master

git checkout master
# Switched to branch 'master'

把 upstream/master 分支合并到本地 master 上，这样就完成了同步，并且不会丢掉本地修改的内容。
git merge upstream/master

git merge upstream/master
# Updating a422352..5fdff0f
# Fast-forward
#  README                    |    9 -------
#  README.md                 |    7 ++++++
#  2 files changed, 7 insertions(+), 9 deletions(-)
#  delete mode 100644 README
#  create mode 100644 README.md

如果想更新到 GitHub 的 fork 上，直接 git push origin master 就好了。

现有的文件夹或Git版本库

cd existing_folder
git init
git remote add origin http://xxxx.com/jx/gateway.git
git add .
git commit -m "init"
git push -u origin master

git回滚到之前提交的某个版本

git log 或者使用git reflog查看你要回退的commitID
commit commitID
Author: xx <xxx@xx.com>
...... 
1234

回到指定版本：

git reset --hard commitID

强制提交：

git push -f origin 你要覆盖的分支

git修改commit备注信息

git commit --amend 此时会进入默认vim编辑器，修改注释完毕后保存就好了。

reference

最后更新于3年前

这有帮助吗？

git remote -v # origin https://github.com/YOUR_USERNAME/YOUR_FORK.git (fetch) # origin https://github.com/YOUR_USERNAME/YOUR_FORK.git (push) # upstream https://github.com/ORIGINAL_OWNER/ORIGINAL_REPOSITORY.git (fetch) # upstream https://github.com/ORIGINAL_OWNER/ORIGINAL_REPOSITORY.git (push)

git fetch upstream # remote: Counting objects: 75, done. # remote: Compressing objects: 100% (53/53), done. # remote: Total 62 (delta 27), reused 44 (delta 9) # Unpacking objects: 100% (62/62), done. # From https://github.com/ORIGINAL_OWNER/ORIGINAL_REPOSITORY # * [new branch] master -> upstream/master

git merge upstream/master # Updating a422352..5fdff0f # Fast-forward # README | 9 ------- # README.md | 7 ++++++ # 2 files changed, 7 insertions(+), 9 deletions(-) # delete mode 100644 README # create mode 100644 README.md