版权声明:本文为博主原创文章,转载请保留出处blog.csdn.net/syrchina https://blog.csdn.net/syrchina/article/details/79300151
git note
1. git init
2. git add mycode.c
3. git commit -m "add mycode.c file"
4. git remote add origin [email protected]:username/prj_name.git
5. git push -u origin master //这一步可能出错,原因是github中的README.md文件不在本地代码目录中,需先 git pull --rebase origin master
6. 后续提交方法:
a. git add filename
全部add: git add .
只add已添加文件:git add . -u
b. git commit -m "log"
c. git push origin master
7. diff:
a. git diff <commit> <filename>
例如前两次提交的差异:git diff HEAD^ HEAD src/button.c
HEAD 最近一次 commit
HEAD^ 上次提交
HEAD~100 上100次提交
不带filename则表示全部diff
8. 用户名和邮箱设置:
修改全局用户名和邮箱:
git config --global user.name "name"
git config --global user.email "email"
为本目录设置专用用户名和邮箱:
打开.git文件夹下的.config文件,增加如下内容:
[user]
name = your_name
email = your_email_address
9. branch:
a. 新建并进入branch: git checkout -b branch_1
b. 回到master: git checkout master
c. merge branch_1 到 master:
git checkout master
git merge hotfix (如果没有冲突,会自动合并和commit;如果有冲突,需手动合并和commit, 可以用工具git mergetool)
d. 删除branch: git branch -d branch_1
3. 查看全部branch: git branch -a
1. git init
2. git add mycode.c
3. git commit -m "add mycode.c file"
4. git remote add origin [email protected]:username/prj_name.git
5. git push -u origin master //这一步可能出错,原因是github中的README.md文件不在本地代码目录中,需先 git pull --rebase origin master
6. 后续提交方法:
a. git add filename
全部add: git add .
只add已添加文件:git add . -u
b. git commit -m "log"
c. git push origin master
7. diff:
a. git diff <commit> <filename>
例如前两次提交的差异:git diff HEAD^ HEAD src/button.c
HEAD 最近一次 commit
HEAD^ 上次提交
HEAD~100 上100次提交
不带filename则表示全部diff
8. 用户名和邮箱设置:
修改全局用户名和邮箱:
git config --global user.name "name"
git config --global user.email "email"
为本目录设置专用用户名和邮箱:
打开.git文件夹下的.config文件,增加如下内容:
[user]
name = your_name
email = your_email_address
9. branch:
a. 新建并进入branch: git checkout -b branch_1
b. 回到master: git checkout master
c. merge branch_1 到 master:
git checkout master
git merge hotfix (如果没有冲突,会自动合并和commit;如果有冲突,需手动合并和commit, 可以用工具git mergetool)
d. 删除branch: git branch -d branch_1
3. 查看全部branch: git branch -a