git rebase

version2

check git status

• git status
• git log --oneline
• git reflog
• git remote -vv
• git branch

---

reset special version

• git reset --hard

---

push to origin (new changes includes file_add/modify and branch_new/delete)

• git push -u upstream test_ceiling_timeout
• git push origin originbranch:localbranch
• git push --force origin originbranch:localbranch

---

rebase

• git rebase -i HEAD~2
• modify commands, and wq!
  • 除了第一行pike,其他所有行都选择 s 😒, squash = use commit, but meld into previous commit
• modify commit message, and wq!
• git add .
• git rebase --continue
• git push --force -u upstream test_ceiling_timeout
• 如果 upstream这个步骤不成功，可以使用：git push --force origin originbranch:localbranch

---

rbt post --server https://reviewboard..com/ --repository eng**ation/he*nefs --username al --publish

• git add filename
• git commit 'message'
• rbt
• 要在commit之后，push 之前操作 rbt ：https://reviewboard****.com/dashboard/?view=outgoing

---

clone single branch

• git clone -b opencv-2.4 --single-branch https://github.com/Itseez/opencv.git
• git clone -b branch test_file_attri*****1 --single-branch git@github.w/py-.git
• git clone -b BR_LogTest --single-branch git@github.******/onefs.git

---

git diff

• git diff cimmit1 commit2 > ~/git/1.diff
• git diff --full-index 5f1d0ba b930d23 > ~/git/add3testcasesForChangeNotify.diff
• 加 参数 --full-index for /reviewboard.*.com

---

git branch

• git branch -vv
• git checkout -b branchname
• git checkout master
  • git pull 更新
• git branch -a
  • all remotes branches
• git branch
  • all local branches

git merge from master

• git checkout master
• git pull
• git checkout
• git merge master

git branch delete

• git branch -d
  • 删除本地分支
• git push origin --delete
  • 删除远程分支

git upstream

1. git branch 确定在哪个分支上
2. git checkout -b restructure_01 新建分支
3. git push origin restructure_01：restructure_01 将新建分支推送到远端
4. git branch --set-upstream-to=origin/restructure01 restructure
   将本地分支与远程分支关联， 然后pycharm中可以更新

---

check git status

• git status
• git log --oneline
• git reflog
• git remote -vv
• git branch

---

reset special version

• git reset --hard

---

push to origin (new changes includes file_add/modify and branch_new/delete)

• git push -u upstream test_ceiling_timeout

---

rebase

• git rebase -i HEAD~2
• modify commands, and wq!
• modify commit message, and wq!
• git add .
• git rebase --continue
• git push --force -u upstream test_ceiling_timeout