Skip to content

git.md

Latest commit

 

History

History
148 lines (117 loc) · 5.11 KB

git.md

File metadata and controls

148 lines (117 loc) · 5.11 KB
Raw

每天离开时提交代码的流程

git checkout dev
git pull origin dev
git checkout mybranch
git merge --no-ff dev
git push origin mybranch

每天早上来的时候拉取代码的流程

git checkout dev
git pull origin dev
git checkout mybranch
git merge --no-ff dev

公共文件不要使用代码格式化,提交后必然导致其他人的公共文件代码紊乱

live server is important

http-server

build the connection between the local and the remote empty(repository) 建立本地仓库与远程空白仓库的联系

cd existing_git_repo
git remote add origin https://gitee.com/si_ma_song/cpractice.git
git push -u origin master

git checkout . # 本地所有修改的。没有的提交的，都返回到原来的状态 git stash # 把所有没有提交的修改暂存到stash里面。可用git stash pop恢复。 git reset --hard HASH #返回到某个节点，不保留修改。 git reset --soft HASH #返回到某个节点。保留修改。

git clean -df #返回到某个节点 git clean 参数 -n 显示 将要 删除的 文件 和 目录 -f 删除 文件 -df 删除 文件 和 目录 -x 删除ignore中的文件

git branch --set-upstream-to=origin/master master

配置本地与远程仓库，请参考这篇博客

最终要的是收获这个命令的参数使用 git pull origin master --allow-unrelated-histories

about commit

git commit --amend -m "new message" git commit --no-verify -m "new message" This command can skip the verify process. 修改提交信息 modify the commit message

.gitignore file

.gitignore file '/'matches directory 以斜杠“/”开头表示目录； '' matches random character 以星号“”通配多个字符； 以问号“?”通配单个字符； 以方括号“[]”包含单个字符的匹配列表； 以叹号“!”表示不忽略(跟踪)匹配到的文件或目录；

show the configuration information about git

git config 记录git的本地配置 git config --list 列出了相应的信息

observe the cocmmit history

git log observe relative commit log record; git log --name-status observe the commit filename and the operation type git log --stat show the total changed files and the details git show show the latest commit content

git branch -f master HEAD~3 change the master branch to indicate to the 3rd ancestor of the HEAD;

change the branch name

git branch -m <oldname> <newname> git branch -m <newname>

delete the branch

git branch -d <branchName> git push origin --delete <branchName>

clear the git tree cached

git rm -r --cached . 清除git中所有文件的缓存，进而使得.ignore文件生效 clear the cache of all files in the project so that .ignore file works. git rm --cached filename 清除指定文件的缓存 clear cache of specific file.

observe all relavant historical commit information

git log observe relative commit log record.

git log --reverse with reverse order to view the info.

git branch -f master HEAD~3

change the master branch to indicate to the 3rd ancestor of the HEAD;

git tag command

git tag -a v0.1 -m "comment" [hash5] Set the tag for specific git commit and add the relative comment.If the hash5 is void, then the command will add a tag for current commit git show <tagname> Show the relative tag information git push origin <tagname> push the local tag to origin

git set proxy(deprecated)

You can use tunnel proxy now. git config --global http.https://github.com.proxy http://127.0.0.1:1080 git config --global https.https://github.com.proxy http://127.0.0.1:1080 git config --global http.https://domain.com.proxy http://proxyUsername:proxyPassword@proxy.server.com:port git config --global http.https://domain.com.sslVerify false if you want to unset the proxy,it is better to edit the .gitconfig file in windows

git reset | git revert

git reset --hard hashValue This command will make the current branch back to the hashValue. And there is no history(using git log) git revert hashValue This command will save the operation log but it will only reset the relative commit. So I prefer the former command while developing based on the latest branch

git remote update -p

show the remote branch.

LF or CRLF

git config --global core.autocrlf true|false|input

true means ingnore the difference between lf and crlf

sometimes when you changed the crlf setting.It could cause many diffs

So you should set the conf.then use git to clone

about sslVerify

It is just the same as the tls client verifier setting.

Live server is important

warning: LF will be replaced by CRLF in .gitignore. solve the above problem to here