Git Learner Record
来源:互联网 发布:彩虹六号 淘宝 编辑:程序博客网 时间:2024/06/07 18:31
目录
- 目录
- What is a git
- Preparation
- History
- Install
- configuration
- Begin
- init the git
- stream
- File Operations
- Add git status to check
- Removegit status to check
- Renamegit status to check
- Rollback
- git diff to check to change
- Warning git reset
- gitignore
- gitkeep
- Other options
- Branch
- branch is needed cheap try
- operations
- Merge
- stash
- Remote link to the github or others
- Set up a github account
- password caching
What is a git
git 帮助我们进行代码的版本控制,我于2015/10/1花费一天时间学习一个关于git的视频,然后再参考几篇博客,将git的使用方法全部弄清楚。let's begin!
Preparation
History
- SCCS Source Code Control System
- 1972, closed source, free with Unix
- RCS Revision Control System
- 1982, open source.
- CVS Concurrent Versions System
- 1986 - 1990, open source
- SVN
- 2000, open source
- BitKeeper SCM
- distributed version
- GIT
- github come out
Install
参考官网的安装方法 —— [git web]
- download the tar.gz or some package[your linux]
- tar zxvf *.tar.gz
- /configure
- make && make install
- finish.
or you can try:- apt-get install git
- yum install -y git
- pacman -S git
configuration
- git config –global user.name [your name]
- git config –global user.email [your email]
- git config –global core.editor “vim”
- git config –global color.ui true
- use bash config
- wget https://github.com/git/git/raw/master/contrib/completion/git-completion.bash
- ls
- mv git-completion.bash ~/.git-completion.bash
- add to .bashrc that if exist this bash, source it.
- help
Begin
init the git
- mkdir dir1
- cd dir1
- git init
- add one file (make change)
- git add . (add change)
- git commit -m “some word” (commit change)
- git log -n/ –since/ –until/ –grep
stream
working -add file- staging index -commit- repositiry
File Operations
Add (git status to check)
- git add .
- git commit -m “”
- git diff
- git commit -ma “”
Remove(git status to check)
- git rm filename
- git commit -m “”
Rename(git status to check)
- git add file
- git rm file
- git commit -m “”
- or you can use git mv file1 file2
Rollback
git diff to check to change
- git checkout – file(before add)
it can return the status of the workspace. - git reset HEAD file (after add)
- unstage the file -> before add
- git checkout – file
- git (after commit)
- find the Hash value of commit
- git comment –amend append to the same commit
- git diff –staged
- return the commit status
git checkout [commit hash] – file
Warning [git reset]
- –soft not change staging index & workspace
- –mixed(default) change staging & not workspace
- –hard change staging & change workspace
usage : git reset –soft [commit hash]
git reset HEAD file
-n try to do -f force to do
.gitignore
it can help us to ignore some file or dirreference :
1. help.github.com/articles/ignoring-files
2. github.com/github/gitignore
git config –global core.excludesfile pathtofile
* git rm –cached file
.gitkeep
git log –oneline/ –graph/ –all/ –decorateOther options
- git show [hash]
- git diff [hash] & git diff [hash1]..[hash2]
Branch
branch is needed, cheap, try
- try new ideas
- isolate the workspace
- fast context switching
operations
- git branch
- create -> git branch new_branch_name
- switch -> git checkout branch_name
- git checkout -b new_branch_name
- git diff [branch1]..[branch2] (use –color-words)
- git branch –merged
- git branch -m old_name new_name (–move)
- git barnch -d(–delete) name (-D to delete a non-empty branch)
- prompt
- export PS1=’$(__git_ps1 “(%s)”) > ‘
- export PS1=’\W$(__git_ps1 “(%s)”) > ‘
- export PS1=$PS1’$(__git_ps1 “(%s)”) > ’ (it’s cool !)
Attantion: barnch is a stack mode, current branch can’t be delete
Merge
- git merge exist_branch
- git branch –merged
- conflict
- change by yourselt
- git log –graph –oneline –all –decorate
- git mergetool –tool=
Attention:
* keep lines short
* commits small focused
* merge often
stash
- git stash save “changed mission …”
- git stash list
- git stash show stash@{0} (you may use -p option)
- git stash apply
- git stash pop
- git stash drop stash@{0}
Remote (link to the github or others)
Easily, this can be changed to
Set up a github account
- you set up a account
- Create a repository
- look at the code following
echo # >> README.mdgit initgit add README.mdgit commit -m "first commit"git remote add origin https://github.com/[User account]/[project name].gitgit push -u origin master
- you can easy use
git remote rm origin - git branch -a/-r
- git push -f
- git fetch
- fetch before work
- fetch before push
- fetch often
- git pull = git fetch + git merge
- git push origin :your branch
- git push origin [–delete] branch
[远程分支的使用]
git checkout -b [new_branch]
(make some change)
git commit -am “word”
git push [远程仓库名] [远程分支名(new_branch)]
password caching
Password Caching
or save the ssh key.
0 0
- Git Learner Record
- git record
- record git command
- To record command of git
- Learner League!!!
- WP8 learner
- record- -
- record
- record
- record
- Record
- Record
- record
- record
- Record
- RECORD
- record
- record
- 进程和线程的区别
- 局部敏感哈希LSH(Locality Sensitive Hashing)
- LintCode | Easy | 链表倒数第n个节点 | Nth to Last Node in List
- 4Sum
- 浅谈MySQL中优化sql语句查询常用的30种方法
- Git Learner Record
- nyoj 60 谁获得了最高奖学金
- Swift快速入门-3-運算子、運算元
- shiro默认拦截器
- oracle子查询
- LSTM与GRU的一些比较--论文笔记
- 空类的sizeof为1
- CocoaPods如何安装及使用
- 《不花钱学法语》--18个网站,强化法语六力