Git导入
右键 -> Git GUI Here -> Clone
填写Source和Target
定义User
GUI -> Edit -> Options -> User
Git更新
-
先merge避免与服务端的不同
GUI -> Merge -> Local Merge -
应用更改
GUI -> Stage Changed -
Commit
GUI -> 编写commit message -> commit -
Push到服务器
GUI -> Push -
建立.gitignore文件
Git Bash Here -> touch .gitignore
Git 删除修改
$ git checkout .
$ git clean -dfx
parameter:
d: directory
f: file
x: new
同步代码
$ git pull origin master
master 为当前分支
同步分支
提示:
$ git status
On branch public_preview
Your branch is ahead of ‘origin/public_preview’ by 3 commits.
(use “git push” to publish your local commits)
nothing to commit, working tree clean
$ git reset --hard origin/master
合入分支:
$ git checkout mybranch
$ git merge master
分支操作
切换分支:$ git checkout <BranchName>
查看分支:$ git branch -a
删除本地分支:$ git branch -d <BranchName>
删除远程分支:$ git push origin --delete <BranchName>
回退版本
83ff2785: 版本号
git log
git reset --hard 83ff2785
git push --force
撤销本地commit
git reset --soft HEAD^
同步远程fork版本
查看远程分支情况:
git remote -v
添加远程分支:
git remote add upstream <git_url>
同步远程分支到本地:
git fetch upstream
检查本地代码更改:
git checkout master
合并分支:
git merge upstream/master
合并另外分支的commit
签出当前分支:
git checkout master
cherry-pick commit:
git cherry-pick abcdef
push:
git push