一.上传到gitlab
本地issu-170落后git很多,发生冲突的要手动修改.
2000 cd robot_demo_0226_ws/
2001 ls
2002 cd IGV01-SW-170
2003 ls
2004 git fetch
2005 git add --all
2006 git status
2007 git pull
2008 git commit
2009 git merge
2010 git merge origin/master
2011 git mergetool
2012 git status
2013 git add --all
2014 git commit
2015 git push
2016 git pull
二.git命令简析
git fetch:将远程的更新取回到本地(但不合并(merge))
git fetch origin master
$ git checkout -b newBrach origin/master
上面命令表示，在origin/master的基础上，创建一个新分支。
git merge:在本地分支上合并远程分支
git merge origin/master
在当前分支上，合并origin/master。
git add:主要用于把要提交的文件的信息添加到索引库中。当我们使用git commit时，git将依据索引库中的内容来进行文件的提交
git commit: 将本地修改保存到本地仓库中
git push: 将本地仓库修改推送到服务器上的仓库中
$ git branch -r:查看远程分支
$ git branch -a:查看所有分支
git status:列出当前目录所有还没有被git管理的文件和被git管理且被修改但还未提交(git commit)的文件.
git diff:查看文件修改之处, 如:git diff readme.txt
git pull = git fetch + git merge
1954 cd /home/wang/aaaaaa
1955 ls
1956 cd IGV01-SW/
1957 ls
1958 git status
1959 ls
1960 ls -a
1961 cd .git/
1962 ls
1963 cd ..
1964 ls
1965 git status
1966 cd ~
1967 cd aaaaaa/
1968 cd IGV01-SW/
1969 git status
1970 git fetch
1971 git merge origin/193-automatic-description
1972 git status
1973 git merge origin/master
1974 git checkout bzrobot_diagnostics/bzrobot_status_monitor/LogWarn/2016-03-05-WarnLog.txt
1975 git bzrobot_task_management/bzrobot_proxy_task/generate_dep_libs.cmake
1976 git checkout bzrobot_task_management/bzrobot_proxy_task/generate_dep_libs.cmake
1977 git checkout bzrobot_task_management/bzrobot_task/generate_dep_libs.cmake
1978 git checkout bzrobot_task_management/bzrobot_task/task_scripts/combo_task_agv.script
1979 git merge
1980 git merge origin/master
1981 cat ./bzrobot_user_interface/bzrobot_joy_teleop/bzrobot_joy_teleop/src/joy_teleop.cpp
1982 git commit
1983 git add --all
1984 git commit
1985 git push
1986 git status
1987 git fetch
1988 git status
1989 git checkout -b 195-issue origin/HEAD
1990 git commit
1991 git status
1992 git add --all
1993 git commit
1994 git push
1995 git push --help
1996 git push origin 195-issue
1997 git status
1998 cat ./bzrobot_user_interface/
1999 cat ./bzrobot_user_interface/bzrobot_joy_teleop/bzrobot_joy_teleop/src/joy_teleop.cpp
2000 ls
2001 cd aaaaaa/
2002 ls
2003 cd IGV01-SW/
2004 ls
2005 git fetch
2006 git checkout 195-issue
2007 git checkout -f 195-issue
2008 cat ./bzrobot_user_interface/bzrobot_joy_teleop/bzrobot_joy_teleop/src/joy_teleop.cpp
2009 cd ..
2010 ls
2011 cd IGV01-SW/
2012 ls
2013 git fetch
2014 git checkout origin/195-issue
2015 git checkout bzrobot_diagnostics/bzrobot_status_monitor/LogWarn/2016-03-05-WarnLog.txt
2016 bzrobot_task_management/bzrobot_proxy_task/generate_dep_libs.cmake
2017 bzrobot_task_management/bzrobot_task/generate_dep_libs.cmake
2018 bzrobot_task_management/bzrobot_task/task_scripts/combo_task_agv.script
2019 git checkout bzrobot_task_management/bzrobot_proxy_task/generate_dep_libs.cmake
2020 git checkout bzrobot_task_management/bzrobot_task/task_scripts/combo_task_agv.script
2021 git add --all
2022 git commit
2023 git checkout origin/193-automatic-description
2024 git checkout bzrobot_diagnostics/bzrobot_status_monitor/LogWarn/2016-03-08-WarnLog.txt
2025 git checkout bzrobot_diagnostics/bzrobot_status_monitor/LogWarn/2016-03-09-WarnLog.txt
2026 git commit
2027 cd ~
2028 cd aaaaaa/
2029 ls
2030 cd IGV01-SW/
2031 git fetch
2032 git checkout 193-automatic-description
2033 git commit
2034 git merge origin/193-automatic-description
2035 rm bzrobot_diagnostics/bzrobot_status_monitor/LogWarn/2016-03-08-WarnLog.txt
2036 rm bzrobot_diagnostics/bzrobot_status_monitor/LogWarn/2016-03-09-WarnLog.txt
2037 git merge origin/193-automatic-description
2038 git add --all
2039 git commit
2040 git commit --all
2041 git mergetool
2042 meld
2043 git merge
2044 git mergetool
2045 git status
2046 git checkout -b 193-automatic-description
2047 git status
2048 cat ./bzrobot_user_interface/bzrobot_joy_teleop/bzrobot_joy_teleop/src/joy_teleop.cpp
2049 git commit
2050 git add -all
2051 git add --all
2052 git commit
2053 git status
2054 git merge origin/193-automatic-description
2055 git mergetool
2056 git push
2057 git commit
2058 git push