git add .
git commit -m "commit code"
git push
git status
git add <file>
git rm --cached <file>
# "first commit" 提交信息
git commit -m "first commit" <file>
git push 仓库别名/仓库地址 分支名
# 查看历史版本日志
git reflog
# 查看历史版本详细日志
git log
# 版本回退
git reflog # 查看回退的版本号
git reset --hard 版本号
git branch -v
git branch 分支名
git checkout 分支名
# 站在主要的的分支上操作要合并的分支
git merge 要合并的分支名
(master|MERGING)
git commit
命令时不能带文件名)# 查看状态 (master|MERGING)
git status
# 添加到暂存区
git add <file>
# 执行提交到本地库
git commit -m "merge conflict"
git remote -v
git remote add 别名 远程库https地址
git push 仓库别名/仓库地址 分支名
git pull 仓库别名/仓库地址 分支名
git clone https仓库地址
$ git clone -b backup git@github.com:shaoshaossm/shaoshaossm.github.io.git
pull request
,单击new pull request
git push
报错提交不上去$ git push
To https://github.com/eddiekao/dummy-git.git
! [rejected] master -> master (fetch first)
error: failed to push some refs to 'https://github.com/eddiekao/dummy-git.git'
hint: Updates were rejected because the remote contains work that you do
hint: not have locally. This is usually caused by another repository pushing
hint: to the same ref. You may want to first integrate the remote changes
hint: (e.g., 'git pull ...') before pushing again.
hint: See the 'Note about fast-forwards' in 'git push --help' for details.
这段讯息的意思是线上版本的内容比你电脑里这份还要新,所以Git 不让你推上去。
解决办法
$ git pull --rebase
remote: Counting objects: 3, done.
remote: Compressing objects: 100% (2/2), done.
remote: Total 3 (delta 1), reused 3 (delta 1), pack-reused 0
Unpacking objects: 100% (3/3), done.
From https://github.com/eddiekao/dummy-git
37aaef6..bab4d89 master -> origin/master
First, rewinding head to replay your work on top of it...
Applying: update index
这里加了
--rebase
参数是表示「内容抓下来之后请使用Rebase 方式合并」,当然你想用一般的合并方式也没问题。合并如果没发生冲突,接着应该就可以顺利往上推了。
$ git push -f
Counting objects: 19, done.
Delta compression using up to 4 threads.
Compressing objects: 100% (17/17), done.
Writing objects: 100% (19/19), 2.16 KiB | 738.00 KiB/s, done.
Total 19 (delta 6), reused 0 (delta 0)
remote: Resolving deltas: 100% (6/6), done.
To https://github.com/eddiekao/dummy-git.git
+ 6bf3967...c4ea775 master -> master (forced update)