ln -s ~/bin/gerrit/gerrit_push.sh ~/bin/gerritpush
hsy1wx@WX8-V-0001Y:/media/1.5T/qnx$ repo start dev_sym
git reset HEAD^
git add wakeup_daemon/src/main.cpp
git commit --amend
git reset
git status
git clean -dxf
VCU_HAM_CRITICAL_RECOVERY
git reset --hard HEAD^ 或者 git log git reset --hard cimmitid
git checkout dev_sym
patch: git cherry pick
git status (冲突：Unmerged paths:)
code .(解决冲突)
git add .
git cherry-pick --continue
gerritpush
repo start master --all
git remote -v
git pull
git status
git add .
git rebase --continue
repo sync -c -f --force-sync
git clean -dxf
git checkout .
git pull
cd .reop/manifests/
git checkout -b rb_main origin/rb_main
git status .
cd ../../
repo start rb_main_dev --allcd ctrl+c
cd .repo/manifests/
git checkout default
cd ../../
repo abandon rb_main_dev
repo start qnx7.1_dev --all
repo forall -c "git reset --hard;git clean -dxf"
git stash
git reflog
git reset --hard hash
git reflog
git reset --soft HEAD@{1}
git reset HEAD 将所有此次修改的 file 退回到工作区
add回退 git reset HEAD 将所有暂存区的文件撤回到工作区
commit回退 git reset --soft HEAD^
将git commit和git add一并撤回 git reset --soft HEAD^ && git reset HEAD
git fetch root
git rebase
git reset --hard HEAD^
cd到qnx/vendor/bosch/patac/vcupro/bosch-qnx/common/libs目录下做一下repo sync .然后再编译
hsy1wx@WX8-V-0001Y:/media/1.5T/another_gmvcu/.repo/manifests[rb_main]$ git pull
hsy1wx@WX8-V-0001Y:/media/1.5T/another_gmvcu/.repo/manifests[rb_main]$ grep "snapdragon-auto-hqx-3-1-4-1_hlos_dev_qnx" -nr
submanifests/bosch_qnx.xml:127: <project groups="qnx,qnx_img" remote="root" name="qnx/qualcomm/snapdragon-auto-hqx-3-1-4-1_hlos_dev_qnx" path="vcu/qnx/qcom/qcom_qnx" revision="rb_gmvcu_gmvcu_platform_hqx-3-1-4-1_r00022.2a"/>
2025 git commit --amend --reset-author -s
2026 git log
2027 git status
2028 gerrit
2029 vi apps/qnx_ap/target/filesets/bosch/bosch.qnx.input.build
2030 git rm apps/qnx_ap/target/filesets/bosch/bosch.input-selector.build
2031 git status
2032 vi apps/qnx_ap/target/hypervisor/host/build_files/system.build.tmpl
2033 git diff apps/qnx_ap/target/hypervisor/host/build_files/system.build.tmpl
2034 git status
2035 git add .
2036 git commit --amend
2037 gerrit
2038 git fetch vcupro_qnx
2039 git rebase
2040 git status
2041 vi apps/qnx_ap/target/hypervisor/host/secpol.txt.tmpl
2042 git status
2043 git add .
2044 git rebase --continue
2045 git status
2046 gerrit