mirrors
/
git-flight-rules
mirror of https://github.com/k88hudson/git-flight-rules.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Clean up READMEs (#198)

Browse Source 
Signed-off-by: Gabriel Caruso <carusogabriel34@gmail.com>
pull/200/head
Gabriel Caruso 6 years ago committed by Richard Littauer
parent 590f63c7e6
commit f9792e9c68
4 changed files with 2 additions and 26 deletions
Show Stats Download Patch File Download Diff File

4
CONTRIBUTE.md
Unescape Escape View File

@ -33,7 +33,7 @@ We use a translation tool called [GitLocalize][gl]. Please follow these steps to
1. Go to [GitLocalize's k88hudson/git-flight-rules repository][gl-repo].
1. Sign up using your GitHub account :octocat:.
1. Find the document you are going to translate.
1. Find the document you are going to translate.
1. Happy translating :sparkles: .
1. When you are done, send the translation for reviews.
1. The reviewed translation will be sent as a Pull Request to GitHub by the language moderator in the community.
@ -41,6 +41,6 @@ We use a translation tool called [GitLocalize][gl]. Please follow these steps to
To learn more about how GitLocalize works, visit their [help page][gl-help]. If you find any issues or feature requests, please file them in [GitLocalize's issue tracker][gl-issue-tracker].
[gl]: https://gitlocalize.com
[gl-help]: https://docs.gitlocalize.com/
[gl-help]: https://docs.gitlocalize.com/
[gl-issue-tracker]: https://github.com/gitlocalize/feedback
[gl-repo]: https://gitlocalize.com/repo/598

9
README.md
Unescape Escape View File

@ -111,7 +111,6 @@ For clarity's sake all examples in this document use a customized bash prompt in
<!-- END doctoc generated TOC please keep comment here to allow auto update -->
## Editing Commits
<a name="diff-last"></a>
@ -168,7 +167,6 @@ $ git commit --amend --reset-author --no-edit
If you need to change all of history, see the man page for `git filter-branch`.
<a href="#i-want-to-remove-a-file-from-the-previous-commit"></a>
### I want to remove a file from the previous commit
@ -290,13 +288,11 @@ $ git add -N filename.x
Then, you will need to use the `e` option to manually choose which lines to add. Running `git diff --cached` or
`git diff --staged` will show you which lines you have staged compared to which are still saved locally.
<a href="stage-in-two-commits"></a>
### I want to add changes in one file to two different commits
`git add` will add the entire file to a commit. `git add -p` will allow to interactively select which changes you want to add.
<a href="unstaging-edits-and-staging-the-unstaged"></a>
### I want to stage my unstaged edits, and unstage my staged edits
@ -459,7 +455,6 @@ $ git branch -a
$ git checkout -b <branch> <SHA1_OF_COMMIT>
```
<a name="pull-wrong-branch"></a>
### I pulled from/into the wrong branch
@ -622,7 +617,6 @@ Now, let's *cherry-pick* the commit for bug #21 on top of our branch. That means
At this point, there is a possibility there might be conflicts. See the [**There were conflicts**](#merge-conflict) section in the [interactive rebasing section above](#interactive-rebase) for how to resolve conflicts.
Now let's create a new branch for bug #14, also based on master
```sh
@ -637,7 +631,6 @@ And finally, let's cherry-pick the commit for bug #14:
(14)$ git cherry-pick 5ea5173
```
<a name="delete-stale-local-branches"></a>
### I want to delete local branches that were deleted upstream
Once you merge a pull request on GitHub, it gives you the option to delete the merged branch in your fork. If you aren't planning to keep working on the branch, it's cleaner to delete the local copies of the branch so you don't end up cluttering up your working checkout with a lot of stale branches.
@ -1182,7 +1175,6 @@ Keep in mind that author and committer are not the same. The `--author` is the p
To find all commits containing a specific file you can use:
```sh
$ git log -- <path to file>
```
@ -1438,7 +1430,6 @@ Using `git reset` it is then possible to change master back to the commit it was
(copied and edited from [Source](https://www.atlassian.com/git/tutorials/rewriting-history/git-reflog)).
# Other Resources
## Books

8
README_ru.md
Unescape Escape View File

@ -108,7 +108,6 @@
<!-- END doctoc generated TOC please keep comment here to allow auto update -->
## Редактирование коммитов
<a name="diff-last"></a>
@ -165,7 +164,6 @@ $ git commit --amend --reset-author --no-edit
Если Вам нужно изменить всю историю, то смотрите документацию для `git filter-branch`.
<a href="#i-want-to-remove-a-file-from-the-previous-commit"></a>
### Я хочу удалить файл из предыдущего коммита
@ -287,13 +285,11 @@ $ git add -N filename.x
Затем используйте опцию `e` для ручного выбора строк. Запустив `git diff --cached` или
`git diff --staged`, Вы увидите какие строки вы подготовили по-сравнению с тем, что сохранено в рабочей копии.
<a href="stage-in-two-commits"></a>
### Я хочу добавить изменения одного файла в два разных коммита
`git add` добавляет в коммит весь файл целиком. `git add -p` позволяет интерактивно выбрать изменения, которые Вы хотите добавить.
<a href="unstaging-edits-and-staging-the-unstaged"></a>
### Я хочу подготовить свои неподготовленные правки и убрать из подготовки то, что уже подготовлено
@ -456,7 +452,6 @@ $ git branch -a
$ git checkout -b <branch> <SHA1_OF_COMMIT>
```
<a name="pull-wrong-branch"></a>
### Я стянул изменения (pull) из неправильной ветки или в неправильную ветку
@ -619,7 +614,6 @@ HEAD is now at a13b85e
На этом этапе есть вероятность конфликтов. О том как разрешить конфликты см. в главе [**Здесь были конфликты**](#merge-conflict) в [разделе интерактивное перебазирование выше](#interactive-rebase).
Теперь давайте создадим новую ветку для бага #14, которая также основана на master
```sh
@ -634,7 +628,6 @@ HEAD is now at a13b85e
(14)$ git cherry-pick 5ea5173
```
<a name="delete-stale-local-branches"></a>
### Я хочу удалить локальные ветки, которые были удалены в upstream
Как только Вы слили пулл-реквест на GitHub, Вам предлагают удалить слитую ветку из Вашего форка. Если Вы не планируете продолжать работу в этой ветке, то для поддержания рабочей копии в чистоте Вы можете удалить локальные копии ненужных веток, чтобы не путаться в них.
@ -1395,7 +1388,6 @@ $ git reset --hard 0254ea7
(взято из [Источник](https://www.atlassian.com/git/tutorials/rewriting-history/git-reflog)).
# Другие ресурсы
## Книги

7
README_zh-CN.md
Unescape Escape View File

@ -87,7 +87,6 @@
<!-- END doctoc generated TOC please keep comment here to allow auto update -->
## 编辑提交(editting commits)
<a name="diff-last"></a>
@ -132,7 +131,6 @@ $ git commit --amend --author "New Authorname <authoremail@mydomain.com>"
如果你需要修改所有历史, 参考 'git filter-branch'的指南页.
<a href="#i-want-to-remove-a-file-from-a-commit"></a>
### 我想从一个提交(commit)里移除一个文件
@ -242,13 +240,11 @@ $ git add -N filename.x
然后, 你需要用 `e` 选项来手动选择需要添加的行，执行 `git diff --cached` 将会显示哪些行暂存了哪些行只是保存在本地了。
<a href="stage-in-two-commits"></a>
### 我想把在一个文件里的变化(changes)加到两个提交(commit)里
`git add` 会把整个文件加入到一个提交. `git add -p` 允许交互式的选择你想要提交的部分.
<a href="unstaging-edits-and-staging-the-unstaged"></a>
### 我想把暂存的内容变成未暂存，把未暂存的内容暂存起来
@ -492,7 +488,6 @@ HEAD is now at a13b85e
这时候, 这里可能会产生冲突， 参见[交互式 rebasing 章](#interactive-rebase) [**冲突节**](#merge-conflict) 解决冲突.
再者， 我们为bug #14 创建一个新的分支, 也基于`master`分支
```sh
@ -507,7 +502,6 @@ HEAD is now at a13b85e
(14)$ git cherry-pick 5ea5173
```
<a name="delete-stale-local-branches"></a>
### 我想删除上游(upstream)分支被删除了的本地分支
一旦你在github 上面合并(merge)了一个pull request, 你就可以删除你fork里被合并的分支。 如果你不准备继续在这个分支里工作, 删除这个分支的本地拷贝会更干净，使你不会陷入工作分支和一堆陈旧分支的混乱之中。
@ -985,7 +979,6 @@ $ git reset --hard 0254ea7
([摘自](https://www.atlassian.com/git/tutorials/rewriting-history/git-reflog)).
# 其它资源(Other Resources)
## 书(Books)

Write Preview
Loading…
Cancel
Save