windows下git目录:
使用github、git shell:
eg:spring—framework
1.进入spring-framework目录,git remote -v
本地原始分支:origin
远程原始分支:spring-projects
F:\git [master +2 ~0 -0 | +5 ~1 -0 !]> cd .\spring-framework
F:\git\spring-framework [master ≡]> git remote -v
origin https://github.com/hwhmusic/spring-framework.git (fetch)
origin https://github.com/hwhmusic/spring-framework.git (push)
spring-projects https://github.com/spring-projects/spring-framework.git (fetch)
spring-projects https://github.com/spring-projects/spring-framework.git (push)
F:\git\spring-framework [master ≡]>
2.从spring-framework远程原始分支更新代码:git fetch spring-projects
F:\git\spring-framework [master ≡]> git fetch spring-projects
remote: Counting objects: 17, done.
remote: Compressing objects: 100% (13/13), done.
remote: Total 17 (delta 5), reused 4 (delta 4), pack-reused 0
Unpacking objects: 100% (17/17), done.
From https://github.com/spring-projects/spring-framework
43c60a0..558a10b 4.3.x -> spring-projects/4.3.x
cc5300c..42f101f master -> spring-projects/master
F:\git\spring-framework [master ≡]>
3.合并到本地分支:git merge spring-projects/master
F:\git\spring-framework [master ≡]> git merge spring-projects/master
Merge made by the 'recursive' strategy.
CONTRIBUTING.md | 2 +-
README.md | 2 +-
src/asciidoc/web-mvc.adoc | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
F:\git\spring-framework [master ↑]>
4.提交到github账号:git push origin master
F:\git\spring-framework [master ↑]> git push origin master
Counting objects: 14, done.
Delta compression using up to 4 threads.
Compressing objects: 100% (14/14), done.
Writing objects: 100% (14/14), 1.80 KiB | 0 bytes/s, done.
Total 14 (delta 9), reused 0 (delta 0)
remote: Resolving deltas: 100% (9/9), completed with 7 local objects.
To https://github.com/hwhmusic/spring-framework.git
bcd8b0b..96d95b3 master -> master
F:\git\spring-framework [master ≡]>