1017 git remote -h
1018 git remote add origin2 git@code-sh.rnd.huawei.com:z00165390/SDK_HCC.git
说明:这里的git@code-sh.rnd.huawei.com:z00165390/SDK_HCC.git 需要和codeclub保持一致
origin 也只是一各普通的名字,可以新起一个origin2的名字,只是大家origin比较习惯
1019 git remote -v
1020 git checkout simrun1
1021 git push -u origin2 simrun1
1022 git remote -h
1023 git remote remove origin
1024 git remote -v
1025 git remote rename origin
1026 git remote rename origin2 origin
git remote set-url origin git@github.com:vfdff/llvm-project.git |
说明:同样可以重命名
1027 git remote add upstream git@code-sh.rnd.huawei.com:Compilers_Programming_Languages/SDK_HCC.git
1028 git remtoe -v
使用 git diff origin/release_12x..origin/dev_12x -- file 可以查看文件file从分支release_12x到dev_12x的整体变化
2、获取指定list的一系列commit脚本get-commit-patch.sh
#!/bin/bash
# rebaselist=git-rebase-todo.0327.list
rebaselist=$1
directory="commit"
tempfile=`mktemp temp.XXXXXX`
num=1 # let start=1
while read line
do
echo "check patch: " $line
# set -x
num=$(( $num + 1 )) # let start+=1
gitnode="$(echo $line | awk '{print $1}')"
git format-patch -1 -i $gitnode --start-number $num -o $directory
# set +x
done < $rebaselist
exit 0
FAQ
a、错误现象:git-rebase--interactive: line 94: vi: command not found
解决方法:export GIT_EDITOR=vim
b、git am合入代码git am --reject --ignore-whitespace --keep-non-patch
3、使用.gitignore屏蔽不需要关注的文件,避免git status文件差异太大