GIT/SVN常用操作备忘

这里做个备忘

压缩

---

zip -r sdk.zip sdk
uzip sdk.zip

---

GIT

多分支同步

git stash
git rebase origin/feature_poker_card
git rebase origin/dev   
git push origin -f feature_poker_card
git stash pop

多仓库切换

git reset --mixed 4b01654
git fetch office && git reset --hard office/dev && w
git add .&& git add -A && git commit -m "temp" && git push -f office dev

新建分支，切换分支

git checkout -b feature_optimization
git checkout dev
git reset --hard f1dafd7
git push origin dev -f
git checkout feature_optimization
git push origin feature_optimization

git checkout -b feature_adjustment
git checkout dev
git checkout feature_adjustment
git push origin feature_adjustment

删除分支

# 删除本地分支
git branch -D feature_adjustment
# 删除远端分支
git push origin --delete feature_adjustment

把远程分支的diff拉到本地分支上进行应用

git checkout dev
git pull
git cherry-pick 897868f930babe413ea26b2b2e919e4cdf837ade

git的清洁

git gc
git prune

git lfs

https://docs.gitlab.com/ee/topics/git/lfs/index.html

# 使用
git lfs install 
git lfs track "*.so"
# cat .gitattributes
git add .
git push origin master

# 拉取
git lfs clone  ...

---

SVN

# checkout code
svn checkout ${url}
# update
svn update
# log 
svn log
# diff
svn diff
# add all
# force all
svn add --force .
# add news
svn st | grep \? | sed 's/?    //' | xargs svn add
# add delete
svn st | grep \! | sed 's/!    //' | xargs svn rm
# commit
svn commit -m "${notes}"