mirror of
https://github.com/LCTT/TranslateProject.git
synced 2025-01-13 22:30:37 +08:00
Merge pull request #4036 from alim0x/master
[translated]Basic Git Commands You Must Know
This commit is contained in:
Ezio
commit
cf5eceb12f
@ -1,220 +0,0 @@
|
||||
alim0x translating
|
||||
|
||||
Basic Git Commands You Must Know
|
||||
=====================================
|
||||
|
||||
|
||||
|
||||
*Brief: This quick guide shows you all the basic Git commands and their usage. You can download these commands for quick reference.*
|
||||
|
||||
We have seen the quick guide and [Vi cheat sheet download][1] in an earlier post. In this article, we’ll see all the basic Git commands you need to get started with it.
|
||||
|
||||
### GIT
|
||||
|
||||
[Git][2] is a distributed version control system that is widely used by a number of open source projects. It was started in the year 2005 by Linux founder, [Linus Torvalds][3]. The program allows for a non-linear development of projects, and can handle large amounts of data effectively by storing it on the local server. In this tutorial, we are going to play around Git and learn how to get started with it.
|
||||
|
||||
I am using Ubuntu in this tutorial but you can use any Linux distribution of your choice. Apart from installation, rest all commands are the same in all Linux distributions.
|
||||
|
||||
### INSTALL GIT
|
||||
|
||||
To install git run this command :
|
||||
|
||||
```
|
||||
sudo apt-get install git-core
|
||||
```
|
||||
|
||||
After it finishes downloading, you will have Git installed and ready to use.
|
||||
|
||||
### SETUP GIT:
|
||||
|
||||
After Git is installed, whether from apt-get or from the source, you need to copy your username and email in the gitconfig file. You can access this file at ~/.gitconfig.
|
||||
|
||||
Opening it following a fresh Git install would reveal a completely blank page:
|
||||
|
||||
```
|
||||
sudo vim ~/.gitconfig
|
||||
```
|
||||
|
||||
You can use the follow commands to add in the required information. Replace ‘user’ with your username and ‘user@example.com’ with your email.
|
||||
|
||||
```
|
||||
git config --global user.name "User"
|
||||
git config --global user.email user@example.com
|
||||
```
|
||||
|
||||
And you are done with setting up. Now let’s get started with Git.
|
||||
|
||||
### REPOSITORY:
|
||||
|
||||
Create a new directory, open it and run this command:
|
||||
|
||||
```
|
||||
git init
|
||||
```
|
||||
|
||||
|
||||
|
||||
This will create a new git repository. Your local repository consists of three “trees” maintained by git.
|
||||
|
||||
First one is your Working Directory which holds the actual files. Second one is the Index which acts as a staging area and finally the HEAD which points to the last commit you’ve made.checkout your repository using git clone /path/to/repository.
|
||||
|
||||
Checkout your repository (repository you just created or an existing repository on a server) using git clone /path/to/repository.
|
||||
|
||||
### ADD FILES AND COMMIT:
|
||||
|
||||
You can propose changes using:
|
||||
|
||||
```
|
||||
git add <filename>
|
||||
```
|
||||
|
||||
This will add a new file for the commit. If you want to add every new file, then just do:
|
||||
|
||||
```
|
||||
git add --all
|
||||
```
|
||||
|
||||
Your files are added check your status using
|
||||
|
||||
```
|
||||
git status
|
||||
```
|
||||
|
||||
|
||||
|
||||
As you can see, there are changes but they are not committed. Now you need to commit these changes, use:
|
||||
|
||||
```
|
||||
git commit -m "Commit message"
|
||||
```
|
||||
|
||||
|
||||
|
||||
You can also do (preferred):
|
||||
|
||||
```
|
||||
git commit -a
|
||||
```
|
||||
|
||||
And then write your commit message. Now the file is committed to the HEAD, but not in your remote repository yet.
|
||||
|
||||
### PUSH YOUR CHANGES
|
||||
|
||||
Your changes are in the HEAD of your local working copy. If you have not cloned an existing repository and want to connect your repository to a remote server, you need to add it first with:
|
||||
|
||||
```
|
||||
git remote add origin <serveraddress>
|
||||
```
|
||||
|
||||
Now you are able to push your changes to the selected remote server.To send those changes to your remote repository, run:
|
||||
|
||||
```
|
||||
git push -u origin master
|
||||
```
|
||||
|
||||
### BRANCHING:
|
||||
|
||||
Branches are used to develop features which are isolated from each other. The master branch is the “default” branch when you create a repository. Use other branches for development and merge them back to the master branch upon completion.
|
||||
|
||||
Create a new branch named “mybranch” and switch to it using:
|
||||
|
||||
```
|
||||
git checkout -b mybranch
|
||||
```
|
||||
|
||||
|
||||
|
||||
You can switch back to master by running:
|
||||
|
||||
```
|
||||
git checkout master
|
||||
```
|
||||
|
||||
If you want to delete the branch use:
|
||||
|
||||
```
|
||||
git branch -d mybranch
|
||||
```
|
||||
|
||||
|
||||
|
||||
A branch is not available to others unless you push the branch to your remote repository, so what are you thinking about just push it:
|
||||
|
||||
```
|
||||
git push origin <branchname>
|
||||
```
|
||||
|
||||
### UPDATE AND MERGE
|
||||
|
||||
To update your local repository to the newest commit, run:
|
||||
|
||||
```
|
||||
git pull
|
||||
```
|
||||
|
||||
In your working directory to fetch and merge remote changes.To merge another branch into your active branch (e.g. master), use :
|
||||
|
||||
```
|
||||
git merge <branch>
|
||||
```
|
||||
|
||||
In both cases, git tries to auto-merge changes. Unfortunately, this is not always possible and results in conflicts. You are responsible for merging those conflicts manually by editing the files shown by git. After changing, you need to mark them as merged with
|
||||
|
||||
```
|
||||
git add <filename>
|
||||
```
|
||||
|
||||
Before merging changes, you can also preview them by using
|
||||
|
||||
```
|
||||
git diff <sourcebranch> <targetbranch>
|
||||
```
|
||||
|
||||
### GIT LOG:
|
||||
|
||||
You can see the repository history using.
|
||||
|
||||
```
|
||||
git log
|
||||
```
|
||||
|
||||
To see a log where each commit is one line you can use:
|
||||
|
||||
```
|
||||
git log --pretty=oneline
|
||||
```
|
||||
|
||||
Or maybe you want to see an ASCII art tree of all the branches, decorated with the names of tags and branches:
|
||||
|
||||
```
|
||||
git log --graph --oneline --decorate --all
|
||||
```
|
||||
|
||||
If you want to see only which files have changed:
|
||||
|
||||
```
|
||||
git log --name-status
|
||||
```
|
||||
|
||||
And for any help during the entire process, you can use git --help
|
||||
|
||||
Isn’t Git is awesome!! Congratulation you are done with basics of git. If you like, you can download these basic Git commands as a quick reference guide from the link below:
|
||||
|
||||
[Download Git Cheat Sheet][4]
|
||||
|
||||
|
||||
--------------------------------------------------------------------------------
|
||||
|
||||
via: http://itsfoss.com/basic-git-commands-cheat-sheet/?utm_source=feedburner&utm_medium=feed&utm_campaign=Feed%3A+ItsFoss+%28Its+FOSS%21+An+Open+Source+Blog%29
|
||||
|
||||
作者：[Rakhi Sharma][a]
|
||||
译者：[译者ID](https://github.com/译者ID)
|
||||
校对：[校对者ID](https://github.com/校对者ID)
|
||||
|
||||
本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创编译，[Linux中国](https://linux.cn/) 荣誉推出
|
||||
|
||||
[a]: http://itsfoss.com/author/rakhi/
|
||||
[1]: http://itsfoss.com/download-vi-cheat-sheet/
|
||||
[2]: https://git-scm.com/
|
||||
[3]: https://en.wikipedia.org/wiki/Linus_Torvalds
|
||||
[4]: https://drive.google.com/open?id=0By49_3Av9sT1bXpINjhvU29VNUU
|
||||
218
translated/tech/20160606 Basic Git Commands You Must Know.md
Normal file
218
translated/tech/20160606 Basic Git Commands You Must Know.md
Normal file
@ -0,0 +1,218 @@
|
||||
你应该知道的基础 Git 命令
|
||||
=====================================
|
||||
|
||||
|
||||
|
||||
*简介：这个快速指南将向你展示所有的基础 Git 命令以及用法。你可以下载这些命令作为快速参考。*
|
||||
|
||||
我们在早先一篇文章中已经见过快速指南和 [Vi cheat sheet 下载][1]了。在这篇文章里，我们将会看到开始使用 Git 所需要的基础命令。
|
||||
|
||||
### GIT
|
||||
|
||||
[Git][2] 是一个分布式版本控制系统，它被用在大量开源项目中。它是在 2005 年由 Linux 创始人 [Linus Torvalds][3] 写就的。这个程序允许非线性的项目开发，并且能够通过存储在本地服务器高效处理大量数据。在这个教程里，我们将要和 Git 愉快玩耍并学习如何开始使用它。
|
||||
|
||||
我在这个教程里使用 Ubuntu，但你可以使用你选择的任何发行版。除了安装以外，剩下的所有命令在任何 Linux 发行版上都是一样的。
|
||||
|
||||
### 安装 GIT
|
||||
|
||||
要安装 git 执行以下命令：
|
||||
|
||||
```
|
||||
sudo apt-get install git-core
|
||||
```
|
||||
|
||||
在它完成下载之后，你就安装好了 Git 并且可以使用了。
|
||||
|
||||
### 设置 GIT：
|
||||
|
||||
在 Git 安装之后，不论是从 apt-get 还是从源码安装，你需要将你的用户名和邮箱地址复制到 gitconfig 文件。你可以访问 ~/.gitconfig 这个文件。
|
||||
|
||||
全新安装 Git 之后打开它会是完全空白的页面：
|
||||
|
||||
```
|
||||
sudo vim ~/.gitconfig
|
||||
```
|
||||
|
||||
你也可以使用以下命令添加所需的信息。将‘user’替换成你的用户名，‘user@example.com’替换成你的邮箱。
|
||||
|
||||
```
|
||||
git config --global user.name "User"
|
||||
git config --global user.email user@example.com
|
||||
```
|
||||
|
||||
然后你就完成设置了。现在让我们开始 Git。
|
||||
|
||||
### 仓库：
|
||||
|
||||
创建一个新目录，打开它并运行以下命令：
|
||||
|
||||
```
|
||||
git init
|
||||
```
|
||||
|
||||
|
||||
|
||||
这个命令会创建一个新的 git 仓库。你的本地仓库由三个 git 维护的“树”组成。
|
||||
|
||||
第一个是你的**工作目录**，保存实际的文件。第二个是索引，实际上扮演的是暂存区，最后一个是 HEAD，它指向你最后一个 commit 提交。
|
||||
|
||||
使用 git clone /path/to/repository 签出你的仓库（从你刚创建的仓库或服务器上已存在的仓库）。
|
||||
|
||||
### 添加文件并提交：
|
||||
|
||||
你可以用以下命令添加改动：
|
||||
|
||||
```
|
||||
git add <filename>
|
||||
```
|
||||
|
||||
这会添加一个新文件到暂存区以提交。如果你想添加每个新文件，输入：
|
||||
|
||||
```
|
||||
git add --all
|
||||
```
|
||||
|
||||
添加文件之后可以使用以下命令检查状态：
|
||||
|
||||
```
|
||||
git status
|
||||
```
|
||||
|
||||
|
||||
|
||||
正如你看到的，那里已经有一些变化但还没有提交。现在你需要提交这些变化，使用：
|
||||
|
||||
```
|
||||
git commit -m "提交信息"
|
||||
```
|
||||
|
||||
|
||||
|
||||
你也可以这么做（首选）：
|
||||
|
||||
```
|
||||
git commit -a
|
||||
```
|
||||
|
||||
然后写下你的提交信息。现在你的文件提交到了 HEAD，但还不在你的远程仓库中。
|
||||
|
||||
### 推送你的改动
|
||||
|
||||
你的改动在你本地工作副本的 HEAD 中。如果你还没有从一个已存在的仓库克隆或想将你的仓库连接到远程服务器，你需要先添加它：
|
||||
|
||||
```
|
||||
git remote add origin <服务器地址>
|
||||
```
|
||||
|
||||
现在你可以将改动推送到指定的远程服务器。要将改动发送到远程服务器，运行：
|
||||
|
||||
```
|
||||
git push -u origin master
|
||||
```
|
||||
|
||||
### 分支：
|
||||
|
||||
分支用于开发特性，它们之间是互相独立的。主分支 master 是你创建一个仓库时的“默认”分支。使用其它分支用于开发，在完成时将它合并回主分支。
|
||||
|
||||
创建一个名为“mybranch”的分支并切换到它之上：
|
||||
|
||||
```
|
||||
git checkout -b mybranch
|
||||
```
|
||||
|
||||
|
||||
|
||||
你可以使用这个命令切换回主分支：
|
||||
|
||||
```
|
||||
git checkout master
|
||||
```
|
||||
|
||||
如果你想删除这个分支，执行：
|
||||
|
||||
```
|
||||
git branch -d mybranch
|
||||
```
|
||||
|
||||
|
||||
|
||||
除非你将分支推送到远程服务器上，否则该分支对其他人是不可用的，所以只需把它推送上去：
|
||||
|
||||
```
|
||||
git push origin <分支名>
|
||||
```
|
||||
|
||||
### 更新和合并
|
||||
|
||||
要将你本地仓库更新到最新提交，运行：
|
||||
|
||||
```
|
||||
git pull
|
||||
```
|
||||
|
||||
在你的工作目录获取和合并远程变动。要合并其它分支到你的活动分支（如 master），使用：
|
||||
|
||||
```
|
||||
git merge <分支>
|
||||
```
|
||||
|
||||
在这两种情况下，git 会尝试自动合并（auto-merge）改动。不幸的是，这不总是可能的，可能会导致冲突。你需要负责通过编辑 git 显示的文件，手动合并那些冲突。改动之后，你需要用以下命令将它们标记为已合并：
|
||||
|
||||
```
|
||||
git add <文件名>
|
||||
```
|
||||
|
||||
在合并改动之前，你也可以使用以下命令预览：
|
||||
|
||||
```
|
||||
git diff <源分支> <目标分支>
|
||||
```
|
||||
|
||||
### GIT 日志：
|
||||
|
||||
你可以这么查看仓库历史：
|
||||
|
||||
```
|
||||
git log
|
||||
```
|
||||
|
||||
要查看每个提交一行样式的日志你可以用：
|
||||
|
||||
```
|
||||
git log --pretty=oneline
|
||||
```
|
||||
|
||||
或者也许你想要看一个所有分支的 ASCII 艺术树，带有标签和分支名：
|
||||
|
||||
```
|
||||
git log --graph --oneline --decorate --all
|
||||
```
|
||||
|
||||
如果你只想看哪些文件改动过：
|
||||
|
||||
```
|
||||
git log --name-status
|
||||
```
|
||||
|
||||
在这整个过程中如果你需要任何帮助，你可以用 git --help。
|
||||
|
||||
Git 棒不棒！！！祝贺你你已经会 git 基础了。如果你愿意的话，你可以从下面这个链接下载这些基础 Git 命令作为快速参考：
|
||||
|
||||
[下载 Git Cheat Sheet][4]
|
||||
|
||||
|
||||
--------------------------------------------------------------------------------
|
||||
|
||||
via: http://itsfoss.com/basic-git-commands-cheat-sheet/
|
||||
|
||||
作者：[Rakhi Sharma][a]
|
||||
译者：[alim0x](https://github.com/alim0x)
|
||||
校对：[校对者ID](https://github.com/校对者ID)
|
||||
|
||||
本文由 [LCTT](https://github.com/LCTT/TranslateProject) 原创编译，[Linux中国](https://linux.cn/) 荣誉推出
|
||||
|
||||
[a]: http://itsfoss.com/author/rakhi/
|
||||
[1]: http://itsfoss.com/download-vi-cheat-sheet/
|
||||
[2]: https://git-scm.com/
|
||||
[3]: https://en.wikipedia.org/wiki/Linus_Torvalds
|
||||
[4]: https://drive.google.com/open?id=0By49_3Av9sT1bXpINjhvU29VNUU
|
||||
Loading…
Reference in New Issue
Block a user