把自己分支合并到Dev分支
git add . # 提交到暂存区git commit -m "提交备注" # 把暂存区文件提交到本地仓库git push 自己分支名 # 本地上传到远程分支git checkout dev # 切换到dev分支git pull # 拉取dev最新代码git checkout 自己分支 # 切换到自己分支git merge dev # 合并dev代码,解决冲突,此刻自己分支代码是最新的git pushgit checkout devgit pullgit merge 自己分支 #为确保不会丢失代码,在将自己分支代码合并到devgit push # 现在dev和自己分支都已是最新代码git branch -a # 查看远端分支 # 定义对所有用户都生效的命令别名alias gitp1='git checkout dev && git pull && git checkout zhouxia && git merge dev && git push && git checkout zhouxia'alias gitp2='git checkout dev && git pull && git merge zhouxia && git push && git checkout zhouxia'alias # 查看所有命令别名，可看到gitp1,gitp2# 现在就可以直接输入别名来执行命令了# 上面直接在命令行添加是临时的,下面是永久生效vim ~/.bash_profile # 在文件最后添加别名后保存source ~/.bash_profilealias gitp1 # 可查看别名为gitp1的命令# 拉取远程分支并同时创建对应的本地分支 （git checkout -b 要创建的本地分支名 origin/要拉取的远程分支名）git checkout -b nan-v0.1.1 origin/dev-bbtc/v0.1.1 git branch mybranch # 创建分支git checkout mybranch # 切换分支git checkout -b mybranch # 创建并切换分支git rebase master # 更新master主线上的东西到该分支上git branch -d mybranch # 删除分支git branch -D mybranch # 强制删除分支 mkdir goservercd goservergit clone -b zhouxia ssh://git@git.shining3d.com:10022/cloud3d/gdocserver.git ./ # 要加./ 否则git会自己再建个目录,-b 指定拉取的分支git branch -r # 查看分支信息git pull # 拉取项目git checkout 分支名 # 切换到自己的分支git pull # 拉取分支项目 shining3ddeMacBook-Pro-2:gdocserver shining3d$ git branch* dev zhouxiashining3ddeMacBook-Pro-2:gdocserver shining3d$ git pullThere is no tracking information for the current branch.Please specify which branch you want to merge with.See git-pull(1) for details. git pull <remote> <branch>If you wish to set tracking information for this branch you can do so with: git branch --set-upstream-to=origin/<branch> devshining3ddeMacBook-Pro-2:gdocserver shining3d$ git merge zhouxiaAlready up to date.shining3ddeMacBook-Pro-2:gdocserver shining3d$ git pushfatal: The current branch dev has no upstream branch.To push the current branch and set the remote as upstream, use git push --set-upstream origin devshining3ddeMacBook-Pro-2:gdocserver shining3d$ shining3ddeMacBook-Pro-2:gdocserver shining3d$ git push --set-upstream origin devTotal 0 (delta 0), reused 0 (delta 0)remote: . Processing 1 referencesremote: Processed 1 references in totalTo ssh://git.shining3d.com:10022/cloud3d/gdocserver.git 2c5bf09..a6b4e8d dev -> devBranch 'dev' set up to track remote branch 'dev' from 'origin'.shining3ddeMacBook-Pro-2:gdocserver shining3d$ git checkout zhouxiaSwitched to branch 'zhouxia'Your branch is up to date with 'origin/zhouxia'.shining3ddeMacBook-Pro-2:gdocserver shining3d$ git restore 文件名 # 丢弃工作区的修改git 标签tag使用参考:https://www.cnblogs.com/pinefantasy/articles/6287165.html
git下查看登录的用户名邮箱
git config user.namegit config user.emailgit config --global user.name "username" ## 修改git用户名为usernamegit config --global user.email "email" # 修改git登录邮箱为email