mirror of
https://github.com/LCTT/TranslateProject.git
synced 2024-12-29 21:41:00 +08:00
Ezio
GitHub
commit
a9310915ab
@ -1,217 +0,0 @@
|
||||
translating by liuxinyu123
|
||||
|
||||
Complete “Beginners to PRO” guide for GIT commands
|
||||
======
|
||||
In our [**earlier tutorial,**][1] we have learned to install git on our machines. In this tutorial, we will discuss how we can use git i.e. various commands that are used with git. So let's start,In our earlier tutorial, we have learned to install git on our machines. In this tutorial, we will discuss how we can use git i.e. various commands that are used with git. So let's start,
|
||||
|
||||
( **Recommended Read** : [**How to install GIT on Linux (Ubuntu & CentOS)**][1] )
|
||||
|
||||
### Setting user information
|
||||
|
||||
This should the first step after installing git. We will add user information (user name & email), so that the when we commit the code, commit messages will be generated with the user information which makes it easier to keep track of the commit progress. To add user information about user, command is 'git config'
|
||||
|
||||
**$ git config - - global user.name "Daniel"**
|
||||
|
||||
**$ git config - - global user.email "dan.mike@xyz.com"**
|
||||
|
||||
After adding the information, we will now check if the information has been updated successfully by running,
|
||||
|
||||
**$ git config - - list**
|
||||
|
||||
& we should see our user information as the output.
|
||||
|
||||
( **Also Read** : [**Scheduling important jobs with CRONTAB**][3] )
|
||||
|
||||
### GIT Commands
|
||||
|
||||
#### Create a new repository
|
||||
|
||||
To create a new repository, run
|
||||
|
||||
**$ git init**
|
||||
|
||||
|
||||
#### Search a repository
|
||||
|
||||
To search a repository, command is
|
||||
|
||||
**$ git grep "repository"**
|
||||
|
||||
|
||||
#### Connect to a remote repository
|
||||
|
||||
To connect to a remote repository, run
|
||||
|
||||
**$ git remote add origin remote_server**
|
||||
|
||||
Then to check all the configured remote server,
|
||||
|
||||
**$ git remote -v**
|
||||
|
||||
|
||||
#### Clone a repository
|
||||
|
||||
To clone a repository from a local server, run the following commands
|
||||
|
||||
**$ git clone repository_path**
|
||||
|
||||
If we want to clone a repository locate at remote server, then the command to clone the repository is,
|
||||
|
||||
**$ git clone[[email protected]][2] :/repository_path**
|
||||
|
||||
|
||||
#### List Branches in repository
|
||||
|
||||
To check list all the available & the current working branch, execute
|
||||
|
||||
**$ git branch**
|
||||
|
||||
|
||||
#### Create new branch
|
||||
|
||||
To create & use a new branch, command is
|
||||
|
||||
**$ git checkout -b 'branchname'**
|
||||
|
||||
|
||||
#### Deleting a branch
|
||||
|
||||
To delete a branch, execute
|
||||
|
||||
**$ git branch -d 'branchname'**
|
||||
|
||||
To delete a branch on remote repository, execute
|
||||
|
||||
**$ git push origin : 'branchname'**
|
||||
|
||||
|
||||
#### Switch to another branch
|
||||
|
||||
To switch to another branch from current branch, use
|
||||
|
||||
**$ git checkout 'branchname'**
|
||||
|
||||
|
||||
#### Adding files
|
||||
|
||||
To add a file to the repo, run
|
||||
|
||||
**$ git add filename**
|
||||
|
||||
|
||||
#### Status of files
|
||||
|
||||
To check status of files (files that are to be commited or are to added), run
|
||||
|
||||
**$ git status**
|
||||
|
||||
|
||||
#### Commit the changes
|
||||
|
||||
After we have added a file or made changes to one, we will commit the code by running,
|
||||
|
||||
**$ git commit -a**
|
||||
|
||||
To commit changes to head and not to remote repository, command is
|
||||
|
||||
**$ git commit -m "message"**
|
||||
|
||||
|
||||
#### Push changes
|
||||
|
||||
To push changes made to the master branch of the repository, run
|
||||
|
||||
**$ git push origin master**
|
||||
|
||||
|
||||
#### Push branch to repository
|
||||
|
||||
To push the changes made on a single branch to remote repository, run
|
||||
|
||||
**$ git push origin 'branchname'**
|
||||
|
||||
To push all branches to remote repository, run
|
||||
|
||||
**$ git push -all origin**
|
||||
|
||||
|
||||
#### Merge two branches
|
||||
|
||||
To merge another branch into the current active branch, use
|
||||
|
||||
**$ git merge 'branchname'**
|
||||
|
||||
|
||||
#### Merge from remote to local server
|
||||
|
||||
To download/pull changes to working directory on local server from remote server, run
|
||||
|
||||
**$ git pull**
|
||||
|
||||
|
||||
#### Checking merge conflicts
|
||||
|
||||
To view merge conflicts against base file, run
|
||||
|
||||
**$ git diff -base 'filename'**
|
||||
|
||||
To see all the conflicts, run
|
||||
|
||||
**$ git diff**
|
||||
|
||||
If we want to preview all the changes before merging, execute
|
||||
|
||||
**$ git diff 'source-branch' 'target-branch'**
|
||||
|
||||
|
||||
#### Creating tags
|
||||
|
||||
To create tags to mark any significant changes, run
|
||||
|
||||
**$ git tag 'tag number' 'commit id'**
|
||||
|
||||
We can find commit id by running,
|
||||
|
||||
**$ git log**
|
||||
|
||||
|
||||
#### Push tags
|
||||
|
||||
To push all the created tags to remote server, run
|
||||
|
||||
**$ git push -tags origin**
|
||||
|
||||
|
||||
#### Revert changes made
|
||||
|
||||
If we want to replace changes made on current working tree with the last changes in head, run
|
||||
|
||||
**$ git checkout -'filename'**
|
||||
|
||||
We can also fetch the latest history from remote server & point it local repository's master branch, rather than dropping all local changes made. To do this, run
|
||||
|
||||
**$ git fetch origin**
|
||||
|
||||
**$ git reset -hard master**
|
||||
|
||||
That's it guys, these are the commands that we can use with git server. We will be back soon with more interesting tutorials. If you wish that we write a tutorial on a specific topic, please let us know via comment box below. As usual, your comments & suggestions are always welcome.
|
||||
|
||||
|
||||
--------------------------------------------------------------------------------
|
||||
|
||||
via: http://linuxtechlab.com/beginners-to-pro-guide-for-git-commands/
|
||||
|
||||
作者：[Shusain][a]
|
||||
译者：[译者ID](https://github.com/译者ID)
|
||||
校对：[校对者ID](https://github.com/校对者ID)
|
||||
|
||||
本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创编译，[Linux中国](https://linux.cn/) 荣誉推出
|
||||
|
||||
[a]:http://linuxtechlab.com/author/shsuain/
|
||||
[1] http://linuxtechlab.com/install-git-linux-ubuntu-centos/
|
||||
[2] /cdn-cgi/l/email-protection
|
||||
[3] http://linuxtechlab.com/scheduling-important-jobs-crontab/
|
||||
[4] https://www.facebook.com/linuxtechlab/
|
||||
[5] https://twitter.com/LinuxTechLab
|
||||
[6] https://plus.google.com/+linuxtechlab
|
||||
[7] http://linuxtechlab.com/contact-us-2/
|
||||
@ -0,0 +1,170 @@
|
||||
GIT 命令"从初学到专业"完整进阶指南
|
||||
===========
|
||||
|
||||
在[之前的教程][1]中，我们已经学习了在机器上安装 git。本教程，我们将讨论如何使用 git，比如与 git 一起使用的各种命令。所以我们开始吧，
|
||||
(**推荐阅读:[如何在 Linux 上安装 GIT (Ubuntu 和 CentOS)][1]**)
|
||||
### 设置用户信息
|
||||
这应该是安装完 git 的第一步。我们将添加用户信息 (用户名和邮箱)，所以当我们提交代码时，会产生带有用户信息的提交信息，这使得跟踪提交过程变得更容易。为了添加用户信息，命令是 `git config`,
|
||||
```
|
||||
$ git config --global user.name "Daniel"
|
||||
$ git config --global user.email "dan.mike@xyz.com"
|
||||
```
|
||||
添加完用户信息之后，通过运行下面命令，我们将检查这些信息是否成功更新,
|
||||
```
|
||||
$ git config --list
|
||||
```
|
||||
并且我们应该能够看到输出的用户信息。
|
||||
(**我们也应该读一下:[使用 CRONTAB 来安排重要的工作][3]**)
|
||||
### GIT 命令
|
||||
#### 新建一个仓库
|
||||
为了建立一个新仓库，运行如下命令，
|
||||
```
|
||||
$ git init
|
||||
```
|
||||
#### 查找一个仓库
|
||||
为了查找一个仓库，命令如下，
|
||||
```
|
||||
$ git grep "repository"
|
||||
```
|
||||
#### 与远程仓库连接
|
||||
为了与远程仓库连接，运行如下命令，
|
||||
```
|
||||
$ git remote add origin remote_server
|
||||
```
|
||||
然后检查所有配置的远程服务器，运行如下命令，
|
||||
```
|
||||
$ git remote -v
|
||||
```
|
||||
#### 克隆一个仓库
|
||||
为了从本地服务器克隆一个仓库，运行如下代码，
|
||||
```
|
||||
$ git clone repository_path
|
||||
```
|
||||
如果我们想克隆远程服务器上的一个仓库，那克隆这个仓库的命令是，
|
||||
```
|
||||
$ git clone repository_path
|
||||
```
|
||||
#### 在仓库中列出分支
|
||||
为了检查所有可用的和当前工作的分支列表，执行
|
||||
```
|
||||
$ git branch
|
||||
```
|
||||
#### 创建新分支
|
||||
创建并使用一个新分支，命令是
|
||||
```
|
||||
$ git checkout -b 'branchname'
|
||||
```
|
||||
#### 删除一个分支
|
||||
为了删除一个分支，执行
|
||||
```
|
||||
$ git branch -d 'branchname'
|
||||
```
|
||||
为了删除远程仓库的一个分支，执行
|
||||
```
|
||||
$ git push origin:'branchname'
|
||||
```
|
||||
#### 切换到另一个分支
|
||||
从当前分支切换到另一个分支，使用
|
||||
```
|
||||
$ git checkout 'branchname'
|
||||
```
|
||||
#### 添加文件
|
||||
添加文件到仓库，执行
|
||||
```
|
||||
$ git add filename
|
||||
```
|
||||
#### 文件状态
|
||||
检查文件状态 (那些将要提交或者添加的文件)，执行
|
||||
```
|
||||
$ git status
|
||||
```
|
||||
#### 提交变更
|
||||
在我们添加一个文件或者对一个文件作出变更之后，我们通过运行下面命令来提交代码，
|
||||
```
|
||||
$ git commit -a
|
||||
```
|
||||
提交变更到 head 并且不提交到远程仓库，命令是，
|
||||
```
|
||||
$ git commit -m "message"
|
||||
```
|
||||
#### 推送变更
|
||||
推送对该仓库 master 分支所做的变更，运行
|
||||
```
|
||||
$ git push origin master
|
||||
```
|
||||
#### 推送分支到仓库
|
||||
推送对单分支做出的变更到远程仓库，运行
|
||||
```
|
||||
$ git push origin 'branchname'
|
||||
```
|
||||
推送所有分支到远程仓库，运行
|
||||
```
|
||||
$ git push -all origin
|
||||
```
|
||||
#### 合并两个分支
|
||||
合并另一个分支到当前活动分支，使用命令
|
||||
```
|
||||
$ git merge 'branchname'
|
||||
```
|
||||
#### 从远端服务器合并到本地服务器
|
||||
从远端服务器下载/拉取变更到到本地服务器的工作目录，运行
|
||||
```
|
||||
$ git pull
|
||||
```
|
||||
#### 检查合并冲突
|
||||
查看对库文件的合并冲突，运行
|
||||
```
|
||||
$ git diff -base 'filename'
|
||||
```
|
||||
查看所有冲突，运行
|
||||
```
|
||||
$ git diff
|
||||
```
|
||||
如果我们在合并之前想预览所有变更，运行
|
||||
```
|
||||
$ git diff 'source-branch' 'target-branch'
|
||||
```
|
||||
#### 创建标记
|
||||
创建标记来标志任一重要的变更，运行
|
||||
```
|
||||
$ git tag 'tag number' 'commit id'
|
||||
```
|
||||
通过运行以下命令，我们可以查找 commit id
|
||||
```
|
||||
$ git log
|
||||
```
|
||||
#### 推送标记
|
||||
推送所有创建的标记到远端服务器，运行
|
||||
```
|
||||
$ git push -tags origin
|
||||
```
|
||||
#### 回复做出的变更
|
||||
如果我们想用 head 中最后一次变更来替换对当前工作树的变更，运行
|
||||
```
|
||||
$ git checkout -'filename'
|
||||
```
|
||||
我们也可以从远端服务器获取最新的历史，并且将它指向本地仓库的 master 分支,而不是丢弃掉所有本地所做所有变更。为了这么做，运行
|
||||
```
|
||||
$ git fetch origin
|
||||
$ git reset -hard master
|
||||
```
|
||||
好了，伙计们。这些就是我们使用 git 服务器的命令。我们将会很快为大家带来更有趣的教程。如果你希望我们对某个特定话题写一个教程，请通过下面的评论箱告诉我们。像往常一样，您的意见和建议都是受欢迎的。
|
||||
|
||||
--------------------------------------------------------------------------------
|
||||
|
||||
via: http://linuxtechlab.com/beginners-to-pro-guide-for-git-commands/
|
||||
|
||||
作者：[Shusain][a]
|
||||
译者：[liuxinyu123](https://github.com/liuxinyu123)
|
||||
校对：[校对者ID](https://github.com/校对者ID)
|
||||
|
||||
本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创编译，[Linux中国](https://linux.cn/) 荣誉推出
|
||||
|
||||
[a]:http://linuxtechlab.com/author/shsuain/
|
||||
[1]:http://linuxtechlab.com/install-git-linux-ubuntu-centos/
|
||||
[2]:/cdn-cgi/l/email-protection
|
||||
[3]:http://linuxtechlab.com/scheduling-important-jobs-crontab/
|
||||
[4]:https://www.facebook.com/linuxtechlab/
|
||||
[5]:https://twitter.com/LinuxTechLab
|
||||
[6]:https://plus.google.com/+linuxtechlab
|
||||
[7]:http://linuxtechlab.com/contact-us-2/
|
||||
Loading…
Reference in New Issue
Block a user